Matthew Barnes b554b16594 Fix merge issues in EMAccountEditor.

2009-07-01 14:39:23 -04:00

..

e-attachment-handler-mail.c

…

e-attachment-handler-mail.h

…

e-mail-shell-backend.c

…

e-mail-shell-backend.h

…

e-mail-shell-content.c

…

e-mail-shell-content.h

…

e-mail-shell-migrate.c

…

e-mail-shell-migrate.h

…

e-mail-shell-settings.c

Fix merge issues in EMAccountEditor.

2009-07-01 14:39:23 -04:00

e-mail-shell-settings.h

…

e-mail-shell-sidebar.c

…

e-mail-shell-sidebar.h

…

e-mail-shell-view-actions.c

…

e-mail-shell-view-actions.h

…

e-mail-shell-view-private.c

…

e-mail-shell-view-private.h

…

e-mail-shell-view.c

…

e-mail-shell-view.h

…

em-account-prefs.c

…

em-account-prefs.h

…

em-composer-prefs.c

…

em-composer-prefs.h

…

em-mailer-prefs.c

Fix merge issues in EMAccountEditor.

2009-07-01 14:39:23 -04:00

em-mailer-prefs.h

Fix merge issues in EMAccountEditor.

2009-07-01 14:39:23 -04:00

em-network-prefs.c

…

em-network-prefs.h

…

evolution-module-mail.c

…

Makefile.am

…