Merge branch 'upstream'

Former-commit-id: 4b1aeda08f8205b41978134013759090ed4716fa
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-04-03 17:08:37 +00:00
commit 8e22d21c06
36 changed files with 33 additions and 33 deletions

View File

@ -1 +1 @@
44cf7ec112594f4314428506fd070ed385355c07 b8bc6aad2cf9c2f696a5b86d87bee1924f08a571

View File

@ -1 +1 @@
4a5d555c96705e7301c7f00f2f6932f64f86bb87 f62963fb071d11f9a757731a717022b85b518fbc

View File

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

View File

@ -1 +1 @@
a7fb500cd3e3e994306ab6d5b214aa8dd13a18ae d1bb2ffee7ac63a76151854a3bc57ec5d6a2a70a

View File

@ -1 +1 @@
14b3df91ea74b8fbf2dd4cecb26fa2b8dd2e5f95 cb3a5f1b627cd361b7fa60e5017534a589c190e8

View File

@ -1 +1 @@
832e19c239189c07e84830b67875773a9ac9c593 a87b90d2710c1e09417833abc258f85dec8566db

View File

@ -1 +1 @@
22eb54f8cea212b7e73e74b56283db83c4fb02fc b5049115aebc36f4f1cf4b65e8715722bb637311

View File

@ -1 +1 @@
8a8ae92bc00eec576a7fce45c384a2acd9257da4 117aaddbc39dba35194d00643b5326873db0790e

View File

@ -1 +1 @@
6c782e0ae1de7e6c5909f2bdf4ed2ec4500b14b6 ae4336859fe9bad244960cdb47c9fd59cbe8349a

View File

@ -1 +1 @@
2feacd91f28e38484bfafa2b6e4d74abbb6b64c0 94f465ca7dc5e23012f67de9f3e3df56f5f87980

View File

@ -1 +1 @@
3926a4cbfbdc807e572e44087b7e5c72d20ab65f 2e2fa407a5b05e54bd0e710eedff9ba8c92bf966

View File

@ -1 +1 @@
14b3df91ea74b8fbf2dd4cecb26fa2b8dd2e5f95 cb3a5f1b627cd361b7fa60e5017534a589c190e8

View File

@ -1 +1 @@
832e19c239189c07e84830b67875773a9ac9c593 a87b90d2710c1e09417833abc258f85dec8566db

View File

@ -1 +1 @@
22eb54f8cea212b7e73e74b56283db83c4fb02fc b5049115aebc36f4f1cf4b65e8715722bb637311

View File

@ -1 +1 @@
8a8ae92bc00eec576a7fce45c384a2acd9257da4 117aaddbc39dba35194d00643b5326873db0790e

View File

@ -1 +1 @@
6c782e0ae1de7e6c5909f2bdf4ed2ec4500b14b6 ae4336859fe9bad244960cdb47c9fd59cbe8349a

View File

@ -1 +1 @@
2feacd91f28e38484bfafa2b6e4d74abbb6b64c0 94f465ca7dc5e23012f67de9f3e3df56f5f87980

View File

@ -1 +1 @@
3926a4cbfbdc807e572e44087b7e5c72d20ab65f 2e2fa407a5b05e54bd0e710eedff9ba8c92bf966

View File

@ -1 +1 @@
14b3df91ea74b8fbf2dd4cecb26fa2b8dd2e5f95 cb3a5f1b627cd361b7fa60e5017534a589c190e8

View File

@ -1 +1 @@
832e19c239189c07e84830b67875773a9ac9c593 a87b90d2710c1e09417833abc258f85dec8566db

View File

@ -1 +1 @@
22eb54f8cea212b7e73e74b56283db83c4fb02fc b5049115aebc36f4f1cf4b65e8715722bb637311

View File

@ -1 +1 @@
8a8ae92bc00eec576a7fce45c384a2acd9257da4 117aaddbc39dba35194d00643b5326873db0790e

View File

@ -1 +1 @@
6c782e0ae1de7e6c5909f2bdf4ed2ec4500b14b6 ae4336859fe9bad244960cdb47c9fd59cbe8349a

View File

@ -1 +1 @@
2feacd91f28e38484bfafa2b6e4d74abbb6b64c0 94f465ca7dc5e23012f67de9f3e3df56f5f87980

View File

@ -1 +1 @@
3926a4cbfbdc807e572e44087b7e5c72d20ab65f 2e2fa407a5b05e54bd0e710eedff9ba8c92bf966

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/8aa3f61" #define FULL_VERSION "explicit/083c130"

View File

@ -326,7 +326,7 @@ typedef struct ucontext {
#endif #endif
#if defined(__linux__) #if defined(__linux__)
typedef struct ucontext os_ucontext; typedef ucontext_t os_ucontext;
#ifdef __mono_ppc64__ #ifdef __mono_ppc64__
#define UCONTEXT_REG_Rn(ctx, n) (((os_ucontext*)(ctx))->uc_mcontext.gp_regs [(n)]) #define UCONTEXT_REG_Rn(ctx, n) (((os_ucontext*)(ctx))->uc_mcontext.gp_regs [(n)])

Binary file not shown.

View File

@ -1 +1 @@
c6a9c5bfd1a92fd395f019a0e49d437207b6b823 ebe2e5afb091670592241a6864f3a9d87706f117

Binary file not shown.

View File

@ -1 +1 @@
2a924939aa1d560f32a4562d585216eaf699c4da 9222611cb1ed0ceef58fac977ce22414de3e975e

Binary file not shown.

View File

@ -1 +1 @@
27e0f2e7c44c90fdda96b868e89d3cca62c25059 8383061c2d674dc3dc8312857244ec4c9cf4e511

View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mono 5.10.1.27\n" "Project-Id-Version: mono 5.10.1.29\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-04-01 08:41+0000\n" "POT-Creation-Date: 2018-04-03 16:30+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

Binary file not shown.

View File

@ -1 +1 @@
517c9152b3ab54be52ea0e8c04a20d2d49641010 44d846efb0be5ec89b90510e181df0f7b3974a78