Matthew Barnes 9192f0dc88 Merge branch 'master' into kill-bonobo ...

Conflicts:
	a11y/widgets/Makefile.am
	a11y/widgets/ea-widgets.c
	a11y/widgets/ea-widgets.h
	addressbook/gui/component/addressbook-component.c
	calendar/gui/Makefile.am
	calendar/gui/calendar-component.c
	calendar/gui/dialogs/comp-editor.c
	calendar/gui/dialogs/event-editor.c
	calendar/gui/dialogs/memo-editor.c
	calendar/gui/dialogs/task-editor.c
	calendar/gui/memos-component.c
	calendar/gui/tasks-component.c
	composer/e-composer-private.c
	composer/e-msg-composer.c
	configure.in
	e-util/e-plugin-ui.c
	e-util/e-plugin-ui.h
	mail/ChangeLog
	mail/Makefile.am
	mail/e-mail-attachment-bar.c
	mail/em-format-html-display.c
	mail/em-format-html-display.h
	mail/em-format-html.h
	mail/em-format.h
	mail/em-popup.c
	mail/mail-component.c
	plugins/external-editor/external-editor.c
	widgets/misc/Makefile.am
	widgets/misc/e-attachment-paned.c
	widgets/misc/e-attachment-view.c
	widgets/misc/e-attachment.c

2009-04-28 21:38:15 -04:00

..

ChangeLog

Fix filter breakage after deprecated Gtk+ symbols removal

2009-04-28 16:31:45 +02:00

ChangeLog.pre-1-4

…

filter-code.c

Merge revisions 36866:37046 from trunk.

2009-01-12 04:12:01 +00:00

filter-code.h

Merge revisions 36866:37046 from trunk.

2009-01-12 04:12:01 +00:00

filter-colour.c

Merge revisions 36016:36303 from trunk.

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

filter-colour.h

Merge revisions 36016:36303 from trunk.

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

filter-datespec.c

GN-bug #572348 - Removed deprecated Gtk+ symbols

2009-04-24 11:45:21 +02:00

filter-datespec.h

Merge revisions 36016:36303 from trunk.

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

filter-element.c

Merge revisions 36811:36865 from trunk.

2008-12-10 18:30:29 +00:00

filter-element.h

Merge revisions 36016:36303 from trunk.

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

filter-file.c

Merge revisions 36016:36303 from trunk.

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

filter-file.h

Merge revisions 36016:36303 from trunk.

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

filter-input.c

Merge revisions 36016:36303 from trunk.

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

filter-input.h

Merge revisions 36016:36303 from trunk.

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

filter-int.c

Merge revisions 36866:37046 from trunk.

2009-01-12 04:12:01 +00:00

filter-int.h

Merge revisions 36016:36533 from trunk.

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

filter-option.c

Fix filter breakage after deprecated Gtk+ symbols removal

2009-04-28 16:31:45 +02:00

filter-option.h

Merge revisions 36811:36865 from trunk.

2008-12-10 18:30:29 +00:00

filter-part.c

Merge revisions 36016:36533 from trunk.

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

filter-part.h

Merge revisions 36016:36303 from trunk.

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

filter-rule.c

GN-bug #572348 - Removed deprecated Gtk+ symbols

2009-04-24 11:45:21 +02:00

filter-rule.h

Merge revisions 36016:36303 from trunk.

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

filter.error.xml

moved e-error to e-util

2005-05-16 06:14:34 +00:00

filter.glade

GN-bug #572348 - Removed deprecated Gtk+ symbols

2009-04-24 11:45:21 +02:00

Makefile.am

Bug 577929 – Consolidate marshallers

2009-04-23 10:02:07 -04:00

rule-context.c

Bug 577929 – Consolidate marshallers

2009-04-23 10:02:07 -04:00

rule-context.h

Merge revisions 36016:36303 from trunk.

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

rule-editor.c

Merge revisions 36866:37046 from trunk.

2009-01-12 04:12:01 +00:00

rule-editor.h

Merge revisions 36016:36303 from trunk.

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