Imported Upstream version 4.0.2.5

Former-commit-id: 8275ee58cba9daf781254d2a1a4c2c104c1250a9
2015-06-24 05:05:18 -04:00
parent cae8e1b2db
commit 4cee7df5e0
21 changed files with 17 additions and 17 deletions
--- a/mono/mini/Makefile.am
+++ b/mono/mini/Makefile.am
@@ -758,7 +758,7 @@ EXTRA_DIST = TestDriver.cs ldscript ldscript.mono \
 	Makefile.am.in

 version.h: Makefile
-	echo "#define FULL_VERSION \"Stable 4.0.2.4/198235d\"" > version.h
+	echo "#define FULL_VERSION \"Stable 4.0.2.5/c99aa0c\"" > version.h

 # Utility target for patching libtool to speed up linking
 patch-libtool:
--- a/mono/mini/Makefile.am.in
+++ b/mono/mini/Makefile.am.in
@@ -758,7 +758,7 @@ EXTRA_DIST = TestDriver.cs ldscript ldscript.mono \
 	Makefile.am.in

 version.h: Makefile
-	echo "#define FULL_VERSION \"Stable 4.0.2.4/198235d\"" > version.h
+	echo "#define FULL_VERSION \"Stable 4.0.2.5/c99aa0c\"" > version.h

 # Utility target for patching libtool to speed up linking
 patch-libtool:
--- a/mono/mini/Makefile.in.REMOVED.git-id
+++ b/mono/mini/Makefile.in.REMOVED.git-id
@@ -1 +1 @@
-c39e0c15b49d478226e1a68b24c751029eb0cd2b
+07a0c8c1ddf80aee829b97c5ba84b3a569a43636
--- a/mono/mini/aot-compiler.c.REMOVED.git-id
+++ b/mono/mini/aot-compiler.c.REMOVED.git-id
@@ -1 +1 @@
-746324b102b743279f76bc697ae22671f330cd68
+3a7fd76d7bfbda58972705ab20fe87bd61bfe4b8
--- a/mono/mini/aot-runtime.c.REMOVED.git-id
+++ b/mono/mini/aot-runtime.c.REMOVED.git-id
@@ -1 +1 @@
-6c2ad4fe626fa544cf78379b0c8266573c0427c3
+4f6e190e7870c918795d049c7ac2c574b773529c
--- a/mono/mini/mini.h.REMOVED.git-id
+++ b/mono/mini/mini.h.REMOVED.git-id
@@ -1 +1 @@
-e063815a4966c455f59c2ca69e06980b06ed3a41
+6d5e1655676ff841eb81fae3ff3b81f9ec6a9b30
--- a/mono/mini/version.h
+++ b/mono/mini/version.h
@@ -1 +1 @@
-#define FULL_VERSION "Stable 4.0.2.4/198235d"
+#define FULL_VERSION "Stable 4.0.2.5/c99aa0c"