Anna Marie Dirks 1c81061178 Fixed cvs conflicts. ...

2000-11-07 Anna Marie Dirks <anna@helixcode.com>
	* Fixed cvs conflicts.

svn path=/trunk/; revision=6485

2000-11-07 18:59:16 +00:00

..

.cvsignore

…

ChangeLog

Updated Message menu.

2000-11-06 20:04:32 +00:00

evolution-addressbook-ldap.xml

…

evolution-addressbook.h

Dunno why these files changed, but they have, checking in anyway.

2000-11-07 12:40:01 +00:00

evolution-addressbook.xml

…

evolution-calendar.xml

…

evolution-contact-editor.xml

…

evolution-event-editor.xml

…

evolution-executive-summary.xml

…

evolution-mail.xml

Updated Message menu.

2000-11-07 00:26:30 +00:00

evolution-message-composer.h

Fixed cvs conflicts.

2000-11-07 18:59:16 +00:00

evolution-message-composer.xml

…

evolution-subscribe.xml

…

evolution-task-editor-dialog.xml

…

evolution.xml

…

Makefile.am

…