From 96f4dc94f20b86d146d24ba6498e3d616bf77c08 Mon Sep 17 00:00:00 2001 From: firebirds Date: Fri, 24 Jan 2014 00:59:14 +0000 Subject: [PATCH] nightly update --- ChangeLog | 5 +++++ src/jrd/build_no.h | 12 ++++++------ src/misc/writeBuildNum.sh | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8481f0e8c0..755d7d1eb0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ + 2014-01-23 18:35 dimitr + M builds/win32/msvc8/Firebird2.sln + M builds/win32/msvc9/Firebird2.sln +Fixed CORE-4323: FB 2.1.5 64bits Windows zip kit misses fbsvcmgr.exe. + 2014-01-11 08:50 dimitr M src/jrd/btr.cpp M src/jrd/btr_proto.h diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h index a35c816080..1c188ee72d 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:18533 + FORMAL BUILD NUMBER:18534 */ -#define PRODUCT_VER_STRING "2.1.6.18533" -#define FILE_VER_STRING "WI-V2.1.6.18533" -#define LICENSE_VER_STRING "WI-V2.1.6.18533" -#define FILE_VER_NUMBER 2, 1, 6, 18533 +#define PRODUCT_VER_STRING "2.1.6.18534" +#define FILE_VER_STRING "WI-V2.1.6.18534" +#define LICENSE_VER_STRING "WI-V2.1.6.18534" +#define FILE_VER_NUMBER 2, 1, 6, 18534 #define FB_MAJOR_VER "2" #define FB_MINOR_VER "1" #define FB_REV_NO "6" -#define FB_BUILD_NO "18533" +#define FB_BUILD_NO "18534" #define FB_BUILD_TYPE "V" #define FB_BUILD_SUFFIX "Firebird 2.1" diff --git a/src/misc/writeBuildNum.sh b/src/misc/writeBuildNum.sh index 6018bced40..cec958005b 100755 --- a/src/misc/writeBuildNum.sh +++ b/src/misc/writeBuildNum.sh @@ -9,7 +9,7 @@ BuildType=V MajorVer=2 MinorVer=1 RevNo=6 -BuildNum=18533 +BuildNum=18534 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then # Normal builds