diff --git a/ChangeLog b/ChangeLog index 2920d6ff91..66f7e8a990 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ + 2013-11-29 11:33 alexpeshkoff + M configure.in + M src/jrd/common.h + M src/jrd/inf_pub.h + M src/jrd/pag.cpp + M src/jrd/utl.cpp +Committed commented ARM64-linux port in order to reserve class ID for it + 2013-11-27 12:48 alexpeshkoff M src/remote/server.cpp Backported fix for CORE-4283: Resource temporarily unavailable errors while simultaneously registering events diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h index f6861cf088..a8339cb91f 100644 --- a/src/jrd/build_no.h +++ b/src/jrd/build_no.h @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:26716 + FORMAL BUILD NUMBER:26717 */ -#define PRODUCT_VER_STRING "2.5.3.26716" -#define FILE_VER_STRING "WI-V2.5.3.26716" -#define LICENSE_VER_STRING "WI-V2.5.3.26716" -#define FILE_VER_NUMBER 2, 5, 3, 26716 +#define PRODUCT_VER_STRING "2.5.3.26717" +#define FILE_VER_STRING "WI-V2.5.3.26717" +#define LICENSE_VER_STRING "WI-V2.5.3.26717" +#define FILE_VER_NUMBER 2, 5, 3, 26717 #define FB_MAJOR_VER "2" #define FB_MINOR_VER "5" #define FB_REV_NO "3" -#define FB_BUILD_NO "26716" +#define FB_BUILD_NO "26717" #define FB_BUILD_TYPE "V" #define FB_BUILD_SUFFIX "Firebird 2.5" diff --git a/src/misc/writeBuildNum.sh b/src/misc/writeBuildNum.sh index 360a49f12e..dccc85242a 100755 --- a/src/misc/writeBuildNum.sh +++ b/src/misc/writeBuildNum.sh @@ -9,7 +9,7 @@ BuildType=V MajorVer=2 MinorVer=5 RevNo=3 -BuildNum=26716 +BuildNum=26717 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then # Normal builds