merge of '9109f0600492701322f24fb53d86a39821e26dc4'

and 'b8291c975f3d5403e63bf731275468c6e29b4087'

Monotone-Parent: 9109f0600492701322f24fb53d86a39821e26dc4
Monotone-Parent: b8291c975f3d5403e63bf731275468c6e29b4087
Monotone-Revision: aee5ac46202888eb15c22cb54f405e48ccf41dae

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2011-09-30T23:01:12
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Ludovic Marcotte 2011-09-30 23:01:12 +00:00
commit e1b4832976
2 changed files with 4 additions and 4 deletions

2
NEWS
View File

@ -1,4 +1,4 @@
1.3-2011MMDD (1.3.9)
2.0-2011MMDD (2.0.0beta - branched from upcoming v1.3.9)
---------------------
New Features
- new user defaults SOGoDefaultCalendar to specify which calendar is used when

View File

@ -2,6 +2,6 @@
# This file is included by library makefiles to set the version information
# of the executable.
MAJOR_VERSION=1
MINOR_VERSION=3
SUBMINOR_VERSION=8
MAJOR_VERSION=2
MINOR_VERSION=0
SUBMINOR_VERSION=0