Patrice Levesque 9cb1b899b0 Merge branch 'master' into fix-some-warnings ... Conflicts: UI/Scheduler/UIxAppointmentActions.m		2016-02-16 14:32:50 -05:00
..
Appointments	Merge branch 'master' into fix-some-warnings	2016-02-16 14:32:50 -05:00
Contacts	Remove pointless #imports from .m and .h files	2016-02-13 16:11:52 -05:00
Mailer	Merge branch 'master' into fix-some-warnings	2016-02-15 11:23:27 -05:00
SOGo	Merge branch 'master' into fix-some-warnings	2016-02-15 11:23:27 -05:00
GNUmakefile	See ChangeLog	2009-10-09 21:54:07 +00:00
common.make	Improved and simplified rpath	2014-10-02 12:36:22 -04:00