summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNanang Izzuddin <nanang@teluu.com>2012-05-22 11:30:26 +0000
committerNanang Izzuddin <nanang@teluu.com>2012-05-22 11:30:26 +0000
commit8e2d652ee100f68448ebaf4b5c2385889199b3d4 (patch)
tree7157852822197010650de1e71a6b01f55fe223aa
parentf6002b63eb3f61b5624519b944c9d59585b08ecb (diff)
Changed version to 1.14.2v1.14.2@4142
git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/1.x@4142 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r--pjlib/include/pj/config.h4
-rw-r--r--version.mak6
2 files changed, 5 insertions, 5 deletions
diff --git a/pjlib/include/pj/config.h b/pjlib/include/pj/config.h
index 4119adb5..0c2f8ef0 100644
--- a/pjlib/include/pj/config.h
+++ b/pjlib/include/pj/config.h
@@ -1125,13 +1125,13 @@ PJ_BEGIN_DECL
#define PJ_VERSION_NUM_MINOR 14
/** PJLIB version revision number. */
-#define PJ_VERSION_NUM_REV 0
+#define PJ_VERSION_NUM_REV 2
/**
* Extra suffix for the version (e.g. "-svn"), or empty for
* web release version.
*/
-#define PJ_VERSION_NUM_EXTRA "-svn"
+#define PJ_VERSION_NUM_EXTRA ""
/**
* PJLIB version number consists of three bytes with the following format:
diff --git a/version.mak b/version.mak
index d2e87c2f..e97aa4b9 100644
--- a/version.mak
+++ b/version.mak
@@ -1,8 +1,8 @@
# Don't change the "export PJ_VERSION_xxx" style, they are parsed by setup.py
export PJ_VERSION_MAJOR := 1
export PJ_VERSION_MINOR := 14
-export PJ_VERSION_REV :=
-export PJ_VERSION_SUFFIX := svn
+export PJ_VERSION_REV := 2
+export PJ_VERSION_SUFFIX :=
export PJ_VERSION := $(PJ_VERSION_MAJOR).$(PJ_VERSION_MINOR)
@@ -11,6 +11,6 @@ export PJ_VERSION := $(PJ_VERSION).$(PJ_VERSION_REV)
endif
ifneq ($(PJ_VERSION_SUFFIX),)
-export PJ_VERSION := $(PJ_VERSION)-$(PJ_VERSION_SUFFIX)
+export PJ_VERSION := $(PJ_VERSION)$(PJ_VERSION_SUFFIX)
endif