Matthew Barnes 19b2934806 Merge branch 'master' into kill-bonobo ...

Conflicts:
	shell/e-shell-window-commands.c

2009-05-06 13:33:54 -04:00

..

common

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

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

conduits

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

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

gui

Merge branch 'master' into kill-bonobo

2009-05-06 13:33:54 -04:00

idl

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

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

importers

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

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

modules

Begin migrating calendar settings to EShellSettings.

2009-04-25 19:37:21 -04:00

AUTHORS

new files to contain utility functions for calendar backends

2001-08-21 13:21:23 +00:00

calendar.error.xml

Merge revisions 36685:36729 from trunk.

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

ChangeLog

Sanitize values from GConf before using them

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

ChangeLog.pre-1-4

Roll over ChangeLogs.

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

Makefile.am

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

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

zones.h

Merge revisions 36016:36303 from trunk.

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