merge of '20f2f393e2f3e95fccc08c07ae5f4c09a9fea602'

and 'be61301b6b2611ae9740f9559b7ea889c4cb9d77' Monotone-Parent: 20f2f393e2f3e95fccc08c07ae5f4c09a9fea602 Monotone-Parent: be61301b6b2611ae9740f9559b7ea889c4cb9d77 Monotone-Revision: 1be014aa5bfe1a03fbebbd16c6bcdfcf7d7ecf9c Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-11-17T17:54:28 Monotone-Branch: ca.inverse.sogo
2010-11-17 17:54:28 +00:00 · 2010-11-17 17:54:28 +00:00 · 9e8df7d069
parent 7dfa0e1365 e4e6b57a64
commit 9e8df7d069
4 changed files with 4 additions and 4 deletions
--- a/Main/Version
+++ b/Main/Version
@ -1,6 +1,6 @@
 # Version file

-SUBMINOR_VERSION:=3
+SUBMINOR_VERSION:=4

 # v0.9.32 requires libSOGo         v0.9.57
 # v0.9.24 requires libWEExtensions v4.5.67
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-1.3-201011DD (1.3.4)
+1.3-20101117 (1.3.4)
 --------------------
 - updated CKEditor to version 3.4.2
 - added event details in invitation email
--- a/SoObjects/Mailer/Version
+++ b/SoObjects/Mailer/Version
@ -1,3 +1,3 @@
 # Version file

-SUBMINOR_VERSION:=3
+SUBMINOR_VERSION:=4
--- a/UI/MainUI/Version
+++ b/UI/MainUI/Version
@ -1,3 +1,3 @@
 # Version file

-SUBMINOR_VERSION:=3
+SUBMINOR_VERSION:=4