Merge to 2.0.7

2013-07-23 08:38:44 -04:00 · 2013-07-23 08:38:44 -04:00 · c9936d7ecf
parent 885e59a2af 9f381e768d
commit c9936d7ecf
2 changed files with 17 additions and 1 deletions
--- a/16
+++ b/16
@ -1,3 +1,19 @@
+commit b531b6160c5ecc41f7160195da1b449dc87d01e3
+Author: Ludovic Marcotte <lmarcotte@inverse.ca>
+Date:   Tue Jul 23 08:31:38 2013 -0400
+
+    Fixed compilation ordering to avoid bug in gnustep-make
+
+M	UI/GNUmakefile
+
+commit 8a041860a01b3f27f631a244727550ca9d90304e
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Fri Jul 19 13:40:33 2013 -0400
+
+    Update ChangeLog
+
+M	ChangeLog
+
 commit d5f76ac832912402d714dd13291c43aa9f84940f
 Author: Francis Lachapelle <flachapelle@inverse.ca>
 Date:   Fri Jul 19 13:39:18 2013 -0400
--- a/UI/GNUmakefile
+++ b/UI/GNUmakefile
@ -8,8 +8,8 @@ SUBPROJECTS += \
 	SOGoElements		\
 	Common			\
 	Contacts		\
+	MailPartViewers         \
 	MailerUI		\
-	MailPartViewers		\
 	MainUI			\
 	PreferencesUI		\
 	Scheduler		\