merge of '7e8a35de12dd8bb06940206b775f3f46887a4476'

and 'd1a795ace9b3ecfe78615e345153f5c37d0ca4b2'

Monotone-Parent: 7e8a35de12dd8bb06940206b775f3f46887a4476
Monotone-Parent: d1a795ace9b3ecfe78615e345153f5c37d0ca4b2
Monotone-Revision: 4899b773e21bd6c56bae726bf720e184b8ef9ec0

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-03-30T15:28:19
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2012-03-30 15:28:19 +00:00

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=15
MAJOR_VERSION=2
MINOR_VERSION=0
SUBMINOR_VERSION=0