Matthew Barnes 31fd01398c Merge branch 'master' into kill-bonobo ...

Conflicts:
	addressbook/util/addressbook.h
	calendar/gui/e-week-view-main-item.c
	configure.ac
	e-util/Makefile.am
	mail/em-account-editor.c
	mail/em-folder-selection-button.c
	shell/e-shell.c

2009-07-10 14:11:48 -04:00

..

addressbook-file

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

attachment-reminder

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

audio-inline

Merge branch 'master' into kill-bonobo

2009-07-01 10:47:10 -04:00

backup-restore

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

bbdb

Fix merge issues in EMAccountEditor.

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

bogo-junk-plugin

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

caldav

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

calendar-file

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

calendar-http

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

calendar-weather

Merge branch 'master' into kill-bonobo

2009-07-10 14:11:48 -04:00

default-mailer

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

default-source

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

email-custom-header

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

exchange-operations

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

external-editor

Merge branch 'master' into kill-bonobo

2009-07-01 10:47:10 -04:00

face

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

google-account-setup

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

groupwise-account-setup

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

groupwise-features

Merge branch 'master' into kill-bonobo

2009-07-01 10:47:10 -04:00

hula-account-setup

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

imap-features

Merge branch 'master' into kill-bonobo

2009-07-01 10:47:10 -04:00

ipod-sync

Merge branch 'master' into kill-bonobo

2009-07-01 10:47:10 -04:00

itip-formatter

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

mail-notification

Merge branch 'master' into kill-bonobo

2009-07-10 14:11:48 -04:00

mail-to-task

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

mailing-list-actions

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

mark-all-read

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

mono

Merge branch 'master' into kill-bonobo

2009-07-01 10:47:10 -04:00

plugin-manager

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

prefer-plain

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

profiler

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

pst-import

Merge branch 'master' into kill-bonobo

2009-07-01 10:47:10 -04:00

publish-calendar

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

python

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

sa-junk-plugin

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

save-calendar

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

startup-wizard

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

subject-thread

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

templates

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

tnef-attachments

Merge branch 'master' into kill-bonobo

2009-07-01 10:47:10 -04:00

vcard-inline

Merge branch 'master' into kill-bonobo

2009-07-01 10:47:10 -04:00

webdav-account-setup

Fix "make distcheck" errors and other build cleanups.

2009-06-30 18:34:08 -04:00

Makefile.am

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

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