From 7398a42c2449d6de744ff52452d619847c2a6ee9 Mon Sep 17 00:00:00 2001 From: firebirds Date: Fri, 27 Jun 2014 01:27:14 +0000 Subject: [PATCH] nightly update --- ChangeLog | 8 ++++++++ src/jrd/build_no.h | 12 ++++++------ src/misc/writeBuildNum.sh | 4 ++-- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2cef5ccc3..fbf3ba151d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ + 2014-06-26 17:23 hvlad + M src/jrd/print.cpp +Fixed compilation errors + + 2014-06-26 09:11 paulbeach + M src/jrd/sdl.cpp +Correct a problem with previous commit + 2014-02-24 08:58 paulbeach M src/gpre/gpre.cpp M src/jrd/sdl.cpp diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h index b8f76900e7..417898e550 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:5039 + FORMAL BUILD NUMBER:5041 */ -#define PRODUCT_VER_STRING "1.5.6.5039" -#define FILE_VER_STRING "WI-V1.5.6.5039" -#define LICENSE_VER_STRING "WI-V1.5.6.5039" -#define FILE_VER_NUMBER 1, 5, 6, 5039 +#define PRODUCT_VER_STRING "1.5.6.5041" +#define FILE_VER_STRING "WI-V1.5.6.5041" +#define LICENSE_VER_STRING "WI-V1.5.6.5041" +#define FILE_VER_NUMBER 1, 5, 6, 5041 #define FB_MAJOR_VER "1" #define FB_MINOR_VER "5" #define FB_REV_NO "6" -#define FB_BUILD_NO "5039" +#define FB_BUILD_NO "5041" #define FB_BUILD_TYPE "V" #define FB_BUILD_SUFFIX "Firebird 1.5" diff --git a/src/misc/writeBuildNum.sh b/src/misc/writeBuildNum.sh index 4a9f3b9ae0..290dc0e84d 100755 --- a/src/misc/writeBuildNum.sh +++ b/src/misc/writeBuildNum.sh @@ -9,7 +9,7 @@ BuildType=V MajorVer=1 MinorVer=5 RevNo=6 -BuildNum=5039 +BuildNum=5041 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then # Normal builds @@ -91,7 +91,7 @@ cat >$1 <