Commit graph

4 commits

Author SHA1 Message Date
Patrice Levesque a5cc2bb5d5 Merge branch 'master' into fix-some-warnings
Conflicts:
	SoObjects/Appointments/SOGoAppointmentObject.m
2016-02-15 11:23:27 -05:00
Patrice Levesque 7c25b53fdf Remove pointless #imports from .m and .h files
This was done with a brute-force approach, ensuring no additional
warnings from GCC 4.9 under x86_64.
2016-02-13 16:11:52 -05:00
Ludovic Marcotte d7b010526b (feat) warn when double-booking attendees and offer force save option 2016-02-11 10:54:07 -05:00
Wolfgang Sourdeau cceeebc234 Monotone-Parent: 14183e9d9367b240b6e0585031a87772c952285a
Monotone-Revision: 6550d093f75808cf03c8781a80f346a0cedf836a

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-02-11T02:36:43
Monotone-Branch: ca.inverse.sogo
2010-02-11 02:36:43 +00:00