diff options
-rw-r--r-- | pjlib/include/pj/config.h | 4 | ||||
-rw-r--r-- | version.mak | 6 |
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 |