Merge branch 'upstream'

Former-commit-id: b56df137450aa6807147a41354d834b9e3e72b03
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-06-19 08:30:10 +00:00
commit eadc205f41
35 changed files with 32 additions and 32 deletions

View File

@ -1 +1 @@
dc3d238eb5b32f3b9d95af57d0add50dae0ea152
cab2a3ba1d347f7b903e9002f483aab13a5f6262

View File

@ -1 +1 @@
82861fc1f4a9dedd06e51008d67c6b3b7b3ba1dd
29ff151aff4578c2f4f9911b05e8ef2b9d88bfa7

View File

@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "5.14.0.134";
public const string MonoVersion = "5.14.0.136";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

View File

@ -1 +1 @@
638ba91f5fe73ff64471b71454b5168427471d68
9bc5ab623e915f2b061bb11931e858e323d28b81

View File

@ -1 +1 @@
ade73dcbf855d754472d484a4ffd634eba1bbced
81704786f614b9566b068099243cbbcec5e01431

View File

@ -1 +1 @@
0810625454c66e829c0287a87039095562557bf5
87d7ee9183655cd6dd498ab61f9f538047e37154

View File

@ -1 +1 @@
18f7c9a48f6ace23980e9438f0c214c2e26cff8c
4adc4d0533a38214b4b7bf8f3c11b82eb6788344

View File

@ -1 +1 @@
f58f2f6586fa5c670a5bdb6ceb1808300e9df869
0ad035417f81239130a7a6ee40c9976ca253b0b0

View File

@ -1 +1 @@
3d3486576cfdc1a7d9ac757b762b06d61a075109
5cc86fb9eeda0070628ec28fbba5a3f73164ee2d

View File

@ -1 +1 @@
c110a47d73cb9303e73d4edc4d8ddee657846219
d896a1a2344d8d2e024c8ef3e88be8eb02613d26

View File

@ -1 +1 @@
638ba91f5fe73ff64471b71454b5168427471d68
9bc5ab623e915f2b061bb11931e858e323d28b81

View File

@ -1 +1 @@
ade73dcbf855d754472d484a4ffd634eba1bbced
81704786f614b9566b068099243cbbcec5e01431

View File

@ -1 +1 @@
0810625454c66e829c0287a87039095562557bf5
87d7ee9183655cd6dd498ab61f9f538047e37154

View File

@ -1 +1 @@
18f7c9a48f6ace23980e9438f0c214c2e26cff8c
4adc4d0533a38214b4b7bf8f3c11b82eb6788344

View File

@ -1 +1 @@
f58f2f6586fa5c670a5bdb6ceb1808300e9df869
0ad035417f81239130a7a6ee40c9976ca253b0b0

View File

@ -1 +1 @@
3d3486576cfdc1a7d9ac757b762b06d61a075109
5cc86fb9eeda0070628ec28fbba5a3f73164ee2d

View File

@ -1 +1 @@
c110a47d73cb9303e73d4edc4d8ddee657846219
d896a1a2344d8d2e024c8ef3e88be8eb02613d26

View File

@ -1 +1 @@
638ba91f5fe73ff64471b71454b5168427471d68
9bc5ab623e915f2b061bb11931e858e323d28b81

View File

@ -1 +1 @@
ade73dcbf855d754472d484a4ffd634eba1bbced
81704786f614b9566b068099243cbbcec5e01431

View File

@ -1 +1 @@
0810625454c66e829c0287a87039095562557bf5
87d7ee9183655cd6dd498ab61f9f538047e37154

View File

@ -1 +1 @@
18f7c9a48f6ace23980e9438f0c214c2e26cff8c
4adc4d0533a38214b4b7bf8f3c11b82eb6788344

View File

@ -1 +1 @@
f58f2f6586fa5c670a5bdb6ceb1808300e9df869
0ad035417f81239130a7a6ee40c9976ca253b0b0

View File

@ -1 +1 @@
3d3486576cfdc1a7d9ac757b762b06d61a075109
5cc86fb9eeda0070628ec28fbba5a3f73164ee2d

View File

@ -1 +1 @@
c110a47d73cb9303e73d4edc4d8ddee657846219
d896a1a2344d8d2e024c8ef3e88be8eb02613d26

View File

@ -1 +1 @@
13d84e99b840cfd0f64ad91c29a7fd2529ab3e67
23b58c2fef2467d157848e992cc58524db6136e7

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/36fe145"
#define FULL_VERSION "explicit/07c8f25"

Binary file not shown.

View File

@ -1 +1 @@
022be62bca96139cc26142102fd4cd0ed883cfa7
c3f0641acdac4e43c9d1b8f5585d6298603b8f5e

Binary file not shown.

View File

@ -1 +1 @@
ab19db700ebdc7c941ebec48e4353e7d89ceeb2b
8d09284808a902465ad7ff9278030227575e9cd2

Binary file not shown.

View File

@ -1 +1 @@
0ec2c4336601c2ea6ee7c91f4ec771dd01d156e9
f16d96dd0d92df2d76ff723392d9ccb1f6066ad2

View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.14.0.134\n"
"Project-Id-Version: mono 5.14.0.136\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-06-17 08:05+0000\n"
"POT-Creation-Date: 2018-06-19 08:07+0000\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 @@
2b30e034db8e5c6ba06fe48af9a39a78e0fa52fc
a0ba3a28a5496c0ca3827f6b69b6a0343fe950a4