Matthew Barnes c3e0648d8b Merge branch 'master' into kill-bonobo ...

Conflicts:
	addressbook/gui/Makefile.am
	addressbook/gui/widgets/Makefile.am
	addressbook/gui/widgets/eab-popup-control.c
	calendar/gui/e-meeting-time-sel.c
	calendar/gui/migration.c
	calendar/modules/e-memo-shell-module-migrate.h
	e-util/e-logger.c
	mail/e-mail-attachment-bar.c
	mail/em-composer-utils.c
	mail/em-format-html-display.c
	plugins/mail-account-disable/Makefile.am
	plugins/select-one-source/Makefile.am
	po/es.po
	shell/Makefile.am
	shell/e-shell-common.h
	shell/e-shell-nm.c
	shell/e-shell-window-commands.c
	shell/e-shell-window.c
	shell/e-sidebar.c
	shell/e-user-creatable-items-handler.c
	shell/importer/Makefile.am
	shell/test/Makefile.am
	widgets/misc/test-error.c
	widgets/misc/test-info-label.c
	widgets/misc/test-multi-config-dialog.c

2009-05-04 09:08:32 -04:00

..

ChangeLog

Do not delete text lines on signature set in composer

2009-04-28 08:06:00 -04:00

ChangeLog.pre-1-4

Roll over ChangeLogs.

2003-06-09 17:31:26 +00:00

e-composer-actions.c

Use consistent variable names for GtkUIManager

2009-04-27 20:27:02 -04:00

e-composer-actions.h

Merge revisions 36685:36729 from trunk.

2008-11-07 22:04:53 +00:00

e-composer-autosave.c

** BUGFIX: 573830 - g_timeout_add_seconds should be preferred to g_timeout_add

2009-05-04 10:10:55 +05:30

e-composer-autosave.h

Merge revisions 36685:36729 from trunk.

2008-11-07 22:04:53 +00:00

e-composer-common.h

Merge revisions 36016:36303 from trunk.

2008-09-11 15:34:29 +00:00

e-composer-from-header.c

Merge revisions 36016:36303 from trunk.

2008-09-11 15:34:29 +00:00

e-composer-from-header.h

Merge revisions 36016:36303 from trunk.

2008-09-11 15:34:29 +00:00

e-composer-header-table.c

Let the mail module handle composer "Post To:" button clicks, since

2009-02-13 04:32:51 +00:00

e-composer-header-table.h

Let the mail module handle composer "Post To:" button clicks, since

2009-02-13 04:32:51 +00:00

e-composer-header.c

Let the mail module handle composer "Post To:" button clicks, since

2009-02-13 04:32:51 +00:00

e-composer-header.h

Let the mail module handle composer "Post To:" button clicks, since

2009-02-13 04:32:51 +00:00

e-composer-name-header.c

Let the mail module handle composer "Post To:" button clicks, since

2009-02-13 04:32:51 +00:00

e-composer-name-header.h

Merge revisions 36685:36729 from trunk.

2008-11-07 22:04:53 +00:00

e-composer-post-header.c

Let the mail module handle composer "Post To:" button clicks, since

2009-02-13 04:32:51 +00:00

e-composer-post-header.h

Let the mail module handle composer "Post To:" button clicks, since

2009-02-13 04:32:51 +00:00

e-composer-private.c

Use consistent variable names for GtkUIManager

2009-04-27 20:27:02 -04:00

e-composer-private.h

Commit the rest of the attachment UI rewrite

2009-04-27 15:36:19 -04:00

e-composer-text-header.c

Merge revisions 36685:36729 from trunk.

2008-11-07 22:04:53 +00:00

e-composer-text-header.h

Merge revisions 36016:36303 from trunk.

2008-09-11 15:34:29 +00:00

e-msg-composer.c

Fix compilation errors.

2009-04-28 21:53:06 -04:00

e-msg-composer.h

Commit the rest of the attachment UI rewrite

2009-04-28 08:22:22 -04:00

evolution-composer.ui

Merge branch 'master' into kill-bonobo

2009-05-04 09:08:32 -04:00

mail-composer.error.xml

Merge revisions 36016:36533 from trunk.

2008-10-01 20:56:04 +00:00

Makefile.am

Use Behdad's brilliant git.mk to generate .gitignore files.

2009-05-03 12:47:34 -04:00