diff --git a/ChangeLog b/ChangeLog index c41903b776..1448ad5785 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ + 2014-01-31 14:43 alexpeshkoff + M builds/install/misc/databases.conf.in + M builds/install/misc/firebird.conf.in + M src/common/config/config_file.cpp + M src/common/config/config_file.h + M src/common/os/path_utils.h + M src/common/os/posix/path_utils.cpp + M src/common/os/win32/path_utils.cpp +Misc enhancements in .conf parser and *.conf.in files + 2014-01-30 14:52 alexpeshkoff M src/qli/exe.cpp Fixed CORE-4327: Error in QLI when copying NULL blobs between databases diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h index edaf3351b0..d090edf81c 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:30868 + FORMAL BUILD NUMBER:30869 */ -#define PRODUCT_VER_STRING "3.0.0.30868" -#define FILE_VER_STRING "WI-T3.0.0.30868" -#define LICENSE_VER_STRING "WI-T3.0.0.30868" -#define FILE_VER_NUMBER 3, 0, 0, 30868 +#define PRODUCT_VER_STRING "3.0.0.30869" +#define FILE_VER_STRING "WI-T3.0.0.30869" +#define LICENSE_VER_STRING "WI-T3.0.0.30869" +#define FILE_VER_NUMBER 3, 0, 0, 30869 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "30868" +#define FB_BUILD_NO "30869" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2" diff --git a/src/misc/writeBuildNum.sh b/src/misc/writeBuildNum.sh index 600dcc08aa..6c6d0cdf11 100755 --- a/src/misc/writeBuildNum.sh +++ b/src/misc/writeBuildNum.sh @@ -9,7 +9,7 @@ BuildType=T MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=30868 +BuildNum=30869 NowAt=`pwd` cd `dirname $0`