|
From: <fir...@us...> - 2013-12-16 00:44:37
|
Revision: 58941
http://sourceforge.net/p/firebird/code/58941
Author: firebirds
Date: 2013-12-16 00:44:33 +0000 (Mon, 16 Dec 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-12-15 01:19:39 UTC (rev 58940)
+++ firebird/trunk/ChangeLog 2013-12-16 00:44:33 UTC (rev 58941)
@@ -1,3 +1,7 @@
+ 2013-12-15 01:19 asfernandes
+ M src/dsql/parse.y
+Remove two introduced reduce/reduce conflict in the parser.
+
2013-12-14 23:59 asfernandes
M src/alice/alice_meta.epp
M src/auth/SecureRemotePassword/manage/SrpManagement.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-12-15 01:19:39 UTC (rev 58940)
+++ firebird/trunk/src/jrd/build_no.h 2013-12-16 00:44:33 UTC (rev 58941)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30794
+ FORMAL BUILD NUMBER:30795
*/
-#define PRODUCT_VER_STRING "3.0.0.30794"
-#define FILE_VER_STRING "WI-T3.0.0.30794"
-#define LICENSE_VER_STRING "WI-T3.0.0.30794"
-#define FILE_VER_NUMBER 3, 0, 0, 30794
+#define PRODUCT_VER_STRING "3.0.0.30795"
+#define FILE_VER_STRING "WI-T3.0.0.30795"
+#define LICENSE_VER_STRING "WI-T3.0.0.30795"
+#define FILE_VER_NUMBER 3, 0, 0, 30795
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30794"
+#define FB_BUILD_NO "30795"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-12-15 01:19:39 UTC (rev 58940)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-12-16 00:44:33 UTC (rev 58941)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30794
+BuildNum=30795
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|