Merge branch 'upstream'

Former-commit-id: 2281ecb0db1600d56794e5b402eb80612ec9497b
This commit is contained in:
Xamarin Public Jenkins 2015-06-24 05:34:35 -04:00
commit 5d9b228d36
21 changed files with 17 additions and 17 deletions

View File

@ -1 +1 @@
f38526856d8b1842bd8d401eb0d67765bff4c2cb
c908dadf9032fd884e4eb15b4e451b9a1456f1aa

View File

@ -1 +1 @@
c5f8a1c26efb5e43b4537118287011b39e48146e
5e1eefc23b8bc74491a1013153f0c68f114a8f88

View File

@ -1 +1 @@
fab1f967bd41df8741fe07faecefc4570b2fa0a0
d2e2263060787a5e37b9477fe11c5343f0115f05

View File

@ -1 +1 @@
02bc04de3431cb4492836a94aa678ff49f7a43b2
2466018829715ab5ac300ffca8d1bb7ec855865b

View File

@ -1 +1 @@
b65949d5a9390ad455d5f54e6afffd8dedd94429
481c08d3c457bfa5fb2f1337f7c7c58cfcd12690

View File

@ -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:

View File

@ -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:

View File

@ -1 +1 @@
c39e0c15b49d478226e1a68b24c751029eb0cd2b
07a0c8c1ddf80aee829b97c5ba84b3a569a43636

View File

@ -1 +1 @@
746324b102b743279f76bc697ae22671f330cd68
3a7fd76d7bfbda58972705ab20fe87bd61bfe4b8

View File

@ -1 +1 @@
6c2ad4fe626fa544cf78379b0c8266573c0427c3
4f6e190e7870c918795d049c7ac2c574b773529c

View File

@ -1 +1 @@
e063815a4966c455f59c2ca69e06980b06ed3a41
6d5e1655676ff841eb81fae3ff3b81f9ec6a9b30

View File

@ -1 +1 @@
#define FULL_VERSION "Stable 4.0.2.4/198235d"
#define FULL_VERSION "Stable 4.0.2.5/c99aa0c"

Binary file not shown.

View File

@ -1 +1 @@
5e56b0a1f2613f59b5e7267001b7fe8b6b86bebd
9b24976a70d1b8540bb066de6de7687a00ec33ea

Binary file not shown.

View File

@ -1 +1 @@
3b480898afbea8dc4f824168008764f173da2d8d
6b68074399dbf6856f14738016f0ca01bfeeba4b

Binary file not shown.

View File

@ -1 +1 @@
9b62d681765d5632890b20973d0b71e75464aa92
04db4cc48179d7ff1d7e2c5af612edbf42a6c49b

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mono 4.0.2\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2015-06-10 18:24-0400\n"
"POT-Creation-Date: 2015-06-24 04:42-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

Binary file not shown.

View File

@ -1 +1 @@
27332917c426a7428e9975a59500e8912fcdc4b4
08ab739a93d37dc29faf6cfc05b286b231a3cf25