Merge branch 'upstream'
Former-commit-id: 6d28283ae21d032f6947f87f312a5f0bb3f04f6a
This commit is contained in:
commit
9d6db8d500
@ -1 +1 @@
|
||||
38b7f4a6fda7fa17e8a8bbce89df0de1f0de5860
|
||||
a5c0065103184fbaa7231339255466d293eb6cb4
|
@ -1 +1 @@
|
||||
9aeec1ff175809aa81fc0adbe224562b2435e5df
|
||||
5d294b134504dc52fee1b91f42902f1c90acbf4b
|
@ -34,7 +34,7 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.10.1.15";
|
||||
public const string MonoVersion = "5.10.1.16";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
@ -1 +1 @@
|
||||
2a998d078ba3fd44b3bcd4bb2ae0bb8efc78b0c2
|
||||
f2f96f9bda35eb2afd682c6662ed6806eec87a2b
|
@ -1 +1 @@
|
||||
9e69e79903c5aa862ff996357e8ab1daaccf80d0
|
||||
a1a358ddd05a21727290fb24567d3aa2db41f89d
|
@ -1 +1 @@
|
||||
21cd6f5a5a783c9bbbacacd41fa8aec8c4033983
|
||||
17e7ea7a2f9a9e89d52ae3f82e397b2a2f72af41
|
@ -1 +1 @@
|
||||
de6f89bff71f22b5ce4eed0b9da24d9c62337fd2
|
||||
559d120991ef0e0340236244798c245608383081
|
@ -1 +1 @@
|
||||
ad83d75376c27b7cef099ffafd3916507394e052
|
||||
79211fe5cf0a63d090b3d93be588eab06e3e4634
|
@ -1 +1 @@
|
||||
7568eb058964df45636634138f1cf64410797c91
|
||||
37e6920b265b3c9d89380a0bc0d1417aed391332
|
@ -1 +1 @@
|
||||
47a527d529054751029b7aa3f0e18459c9b0a89f
|
||||
ef652b72c7cf1aead77b7090c689b662fae6699a
|
@ -1 +1 @@
|
||||
2a998d078ba3fd44b3bcd4bb2ae0bb8efc78b0c2
|
||||
f2f96f9bda35eb2afd682c6662ed6806eec87a2b
|
@ -1 +1 @@
|
||||
9e69e79903c5aa862ff996357e8ab1daaccf80d0
|
||||
a1a358ddd05a21727290fb24567d3aa2db41f89d
|
@ -1 +1 @@
|
||||
21cd6f5a5a783c9bbbacacd41fa8aec8c4033983
|
||||
17e7ea7a2f9a9e89d52ae3f82e397b2a2f72af41
|
@ -1 +1 @@
|
||||
de6f89bff71f22b5ce4eed0b9da24d9c62337fd2
|
||||
559d120991ef0e0340236244798c245608383081
|
@ -1 +1 @@
|
||||
ad83d75376c27b7cef099ffafd3916507394e052
|
||||
79211fe5cf0a63d090b3d93be588eab06e3e4634
|
@ -1 +1 @@
|
||||
7568eb058964df45636634138f1cf64410797c91
|
||||
37e6920b265b3c9d89380a0bc0d1417aed391332
|
@ -1 +1 @@
|
||||
47a527d529054751029b7aa3f0e18459c9b0a89f
|
||||
ef652b72c7cf1aead77b7090c689b662fae6699a
|
@ -1 +1 @@
|
||||
2a998d078ba3fd44b3bcd4bb2ae0bb8efc78b0c2
|
||||
f2f96f9bda35eb2afd682c6662ed6806eec87a2b
|
@ -1 +1 @@
|
||||
9e69e79903c5aa862ff996357e8ab1daaccf80d0
|
||||
a1a358ddd05a21727290fb24567d3aa2db41f89d
|
@ -1 +1 @@
|
||||
21cd6f5a5a783c9bbbacacd41fa8aec8c4033983
|
||||
17e7ea7a2f9a9e89d52ae3f82e397b2a2f72af41
|
@ -1 +1 @@
|
||||
de6f89bff71f22b5ce4eed0b9da24d9c62337fd2
|
||||
559d120991ef0e0340236244798c245608383081
|
@ -1 +1 @@
|
||||
ad83d75376c27b7cef099ffafd3916507394e052
|
||||
79211fe5cf0a63d090b3d93be588eab06e3e4634
|
@ -1 +1 @@
|
||||
7568eb058964df45636634138f1cf64410797c91
|
||||
37e6920b265b3c9d89380a0bc0d1417aed391332
|
@ -1 +1 @@
|
||||
47a527d529054751029b7aa3f0e18459c9b0a89f
|
||||
ef652b72c7cf1aead77b7090c689b662fae6699a
|
@ -1 +1 @@
|
||||
5bca4f0ab73b354fb6ea1f4b4fea6c9a28fd077b
|
||||
e5ab853cd3c68b19321c1f59cc7c08e00e1bcd9b
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/4e27697"
|
||||
#define FULL_VERSION "explicit/bf27e25"
|
||||
|
@ -685,6 +685,7 @@ gboolean
|
||||
mono_thread_info_try_get_internal_thread_gchandle (MonoThreadInfo *info, guint32 *gchandle)
|
||||
{
|
||||
g_assert (info);
|
||||
g_assert (mono_thread_info_is_current (info));
|
||||
|
||||
if (info->internal_thread_gchandle == G_MAXUINT32)
|
||||
return FALSE;
|
||||
@ -697,6 +698,7 @@ void
|
||||
mono_thread_info_set_internal_thread_gchandle (MonoThreadInfo *info, guint32 gchandle)
|
||||
{
|
||||
g_assert (info);
|
||||
g_assert (mono_thread_info_is_current (info));
|
||||
g_assert (gchandle != G_MAXUINT32);
|
||||
info->internal_thread_gchandle = gchandle;
|
||||
}
|
||||
@ -705,6 +707,7 @@ void
|
||||
mono_thread_info_unset_internal_thread_gchandle (THREAD_INFO_TYPE *info)
|
||||
{
|
||||
g_assert (info);
|
||||
g_assert (mono_thread_info_is_current (info));
|
||||
info->internal_thread_gchandle = G_MAXUINT32;
|
||||
}
|
||||
|
||||
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
b3b90a5bf53abd788b35c3a5b015a08303555cd4
|
||||
65bc771ade652bc8b3f3c66a7cfad1f5e33f99dd
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
0dbc7fb0a8873f3d94365913cc3e4f5becb8e64c
|
||||
7481e68f34207388d86528e13af4f23cb34d74d9
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
1ed713d8b393d31879df0bc22a9ddb0ccd19a046
|
||||
11c2a8b9b62b957355744562fed3bbf9813e4fb8
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 5.10.1.15\n"
|
||||
"Project-Id-Version: mono 5.10.1.16\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2018-03-26 08:21+0000\n"
|
||||
"POT-Creation-Date: 2018-03-28 08:24+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"
|
||||
|
BIN
po/mcs/pt_BR.gmo
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
84c495d92f41e5f9a9afdb5a9eb1c856f182ce7c
|
||||
4877001d3b254cb1229617274452316b370cd69d
|
Loading…
x
Reference in New Issue
Block a user