Merge remote-tracking branch 'origin/develop-6.7' into develop-7.0

livecodesebastien · livecodesebastien · commit 546d7485bfeb · 2015-03-25T12:49:31.000Z
Conflicts:
	ide
	revdb/Android.mk
	revxml/Android.mk
	revzip/Android.mk
	version
diff --git a/revdb/Android.mk b/revdb/Android.mk
@@ -26,7 +26,7 @@ LOCAL_LDLIBS += -lz -llog \
 
 # SN-2015-03-25: [[ Bug 14326 ]] Add the symbol to allow the mobile externals to access
 #  the external interface version setting function
-LOCAL_LDFLAGS += -Wl,-u,getXtable -Wl,-u,setExternalInterfaceVersion -Wl,u,configureSecurity
+LOCAL_LDFLAGS += -Wl,-u,getXtable -Wl,-u,setExternalInterfaceVersion -Wl,-u,configureSecurity
 
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/revxml/Android.mk b/revxml/Android.mk
@@ -25,6 +25,6 @@ LOCAL_LDLIBS += -lz \
 
 # SN-2015-03-25: [[ Bug 14326 ]] Add the symbol to allow the mobile externals to access
 #  the external interface version setting function
-LOCAL_LDFLAGS += -Wl,-u,getXtable -Wl,-u,setExternalInterfaceVersion -Wl,u,configureSecurity
+LOCAL_LDFLAGS += -Wl,-u,getXtable -Wl,-u,setExternalInterfaceVersion -Wl,-u,configureSecurity
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/revzip/Android.mk b/revzip/Android.mk
@@ -24,6 +24,6 @@ LOCAL_LDLIBS += -lz \
 	
 # SN-2015-03-25: [[ Bug 14326 ]] Add the symbol to allow the mobile externals to access
 #  the external interface version setting function
-LOCAL_LDFLAGS += -Wl,-u,getXtable -Wl,-u,setExternalInterfaceVersion -Wl,u,configureSecurity
+LOCAL_LDFLAGS += -Wl,-u,getXtable -Wl,-u,setExternalInterfaceVersion -Wl,-u,configureSecurity
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/version b/version
@@ -1,6 +1,6 @@
-BUILD_REVISION = 10028
+BUILD_REVISION = 10029
 BUILD_MAJOR_VERSION = 7
 BUILD_MINOR_VERSION = 0
 BUILD_POINT_VERSION = 4
-BUILD_SHORT_VERSION = 7.0.4-rc-2
-BUILD_LONG_VERSION = 7.0.4.10028 (rc 2)
+BUILD_SHORT_VERSION = 7.0.4-rc-3
+BUILD_LONG_VERSION = 7.0.4.10029 (rc 3)
