Merge branch 'upstream'
Former-commit-id: 0a6ba7f676d20934ed53e1930cd90eb7fcd49a89
This commit is contained in:
commit
9214740fe5
@ -1 +1 @@
|
||||
f0b6e21374ee9752e37831a38c20776e6960cbcd
|
||||
8b48627b7bb555f063c3263fc4eb2f11597e3729
|
@ -1 +1 @@
|
||||
7d6429e36be0550c81f969db37a1ac1e621f4c30
|
||||
37bdd1e7ff88dbc3ff4aaedf2df82bf2aeae3813
|
@ -34,7 +34,7 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.20.0.216";
|
||||
public const string MonoVersion = "5.20.0.217";
|
||||
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 @@
|
||||
bf5efc5447e6f4a911a6ec54f7cf8ad9235fe762
|
||||
31a417e6f28eba64998dca7a63623c3669235430
|
@ -1 +1 @@
|
||||
bb36f1a11545bf4a03eb3573bdea38e58f46cccc
|
||||
f4df4b3be748f78a833fcc3475a59ac7c718a6a0
|
@ -1 +1 @@
|
||||
71b08e4112901e636d98620ac91654b734f56293
|
||||
c1e727cc3cf34e0a83e9b0d7608e9631e0bef270
|
Binary file not shown.
@ -1 +1 @@
|
||||
d37cf271f832133dd652fc851bd0f5d7b9169079
|
||||
2bd555d763202266dc0ef063a3bb7bbf5a5dfd2d
|
@ -1 +1 @@
|
||||
ed7cb36f1271f2b721d6d6a0d794b726adb4cd5b
|
||||
062571da4540762deb844a90f281991f1e8a674d
|
@ -1 +1 @@
|
||||
8000f304b65bd645bc78ec0627662a8cd92b8f36
|
||||
3c61a6f5c4402955173c29c7e5d95d023277dc18
|
@ -1 +1 @@
|
||||
2eaa92b92d5c3487575d87df14a4ed6851924590
|
||||
c571f51c5786e5b3ee1efdf22f890b89ed975f14
|
@ -1 +1 @@
|
||||
bf5efc5447e6f4a911a6ec54f7cf8ad9235fe762
|
||||
31a417e6f28eba64998dca7a63623c3669235430
|
@ -1 +1 @@
|
||||
bb36f1a11545bf4a03eb3573bdea38e58f46cccc
|
||||
f4df4b3be748f78a833fcc3475a59ac7c718a6a0
|
@ -1 +1 @@
|
||||
71b08e4112901e636d98620ac91654b734f56293
|
||||
c1e727cc3cf34e0a83e9b0d7608e9631e0bef270
|
Binary file not shown.
@ -1 +1 @@
|
||||
d37cf271f832133dd652fc851bd0f5d7b9169079
|
||||
2bd555d763202266dc0ef063a3bb7bbf5a5dfd2d
|
@ -1 +1 @@
|
||||
ed7cb36f1271f2b721d6d6a0d794b726adb4cd5b
|
||||
062571da4540762deb844a90f281991f1e8a674d
|
@ -1 +1 @@
|
||||
8000f304b65bd645bc78ec0627662a8cd92b8f36
|
||||
3c61a6f5c4402955173c29c7e5d95d023277dc18
|
@ -1 +1 @@
|
||||
2eaa92b92d5c3487575d87df14a4ed6851924590
|
||||
c571f51c5786e5b3ee1efdf22f890b89ed975f14
|
@ -1 +1 @@
|
||||
bf5efc5447e6f4a911a6ec54f7cf8ad9235fe762
|
||||
31a417e6f28eba64998dca7a63623c3669235430
|
@ -1 +1 @@
|
||||
bb36f1a11545bf4a03eb3573bdea38e58f46cccc
|
||||
f4df4b3be748f78a833fcc3475a59ac7c718a6a0
|
@ -1 +1 @@
|
||||
71b08e4112901e636d98620ac91654b734f56293
|
||||
c1e727cc3cf34e0a83e9b0d7608e9631e0bef270
|
Binary file not shown.
@ -1 +1 @@
|
||||
d37cf271f832133dd652fc851bd0f5d7b9169079
|
||||
2bd555d763202266dc0ef063a3bb7bbf5a5dfd2d
|
@ -1 +1 @@
|
||||
ed7cb36f1271f2b721d6d6a0d794b726adb4cd5b
|
||||
062571da4540762deb844a90f281991f1e8a674d
|
@ -1 +1 @@
|
||||
8000f304b65bd645bc78ec0627662a8cd92b8f36
|
||||
3c61a6f5c4402955173c29c7e5d95d023277dc18
|
@ -1 +1 @@
|
||||
2eaa92b92d5c3487575d87df14a4ed6851924590
|
||||
c571f51c5786e5b3ee1efdf22f890b89ed975f14
|
@ -1 +1 @@
|
||||
bf5efc5447e6f4a911a6ec54f7cf8ad9235fe762
|
||||
31a417e6f28eba64998dca7a63623c3669235430
|
@ -1 +1 @@
|
||||
bb36f1a11545bf4a03eb3573bdea38e58f46cccc
|
||||
f4df4b3be748f78a833fcc3475a59ac7c718a6a0
|
@ -1 +1 @@
|
||||
71b08e4112901e636d98620ac91654b734f56293
|
||||
c1e727cc3cf34e0a83e9b0d7608e9631e0bef270
|
Binary file not shown.
@ -1 +1 @@
|
||||
d37cf271f832133dd652fc851bd0f5d7b9169079
|
||||
2bd555d763202266dc0ef063a3bb7bbf5a5dfd2d
|
@ -1 +1 @@
|
||||
ed7cb36f1271f2b721d6d6a0d794b726adb4cd5b
|
||||
062571da4540762deb844a90f281991f1e8a674d
|
@ -1 +1 @@
|
||||
8000f304b65bd645bc78ec0627662a8cd92b8f36
|
||||
3c61a6f5c4402955173c29c7e5d95d023277dc18
|
@ -1 +1 @@
|
||||
2eaa92b92d5c3487575d87df14a4ed6851924590
|
||||
c571f51c5786e5b3ee1efdf22f890b89ed975f14
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/4c3f26a"
|
||||
#define FULL_VERSION "explicit/2b6f395"
|
||||
|
@ -873,7 +873,13 @@ typedef struct {
|
||||
|
||||
#define MONO_ARCH_HAS_MONO_CONTEXT 1
|
||||
|
||||
#include <sys/ucontext.h>
|
||||
|
||||
#if __GLIBC_PREREQ(2, 27)
|
||||
typedef ucontext_t MonoContext;
|
||||
#else
|
||||
typedef struct ucontext MonoContext;
|
||||
#endif
|
||||
|
||||
#define MONO_CONTEXT_SET_IP(ctx,ip) \
|
||||
do { \
|
||||
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
8527d85061d77a02a5cc5f2bf79e1792eb924620
|
||||
dfbe22a8952f40436357b9c67943b841b362c4d2
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
4cece26a586a9ca67f8054f740e6079db1bec128
|
||||
1f4e1fe28706b09d8add1609c6059c44feb08117
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
bb20b832aaa89eb33068c0a8d05d8f70febc4998
|
||||
e8a095bd92d2ea011ea147933a1acbd031887946
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 5.20.0.216\n"
|
||||
"Project-Id-Version: mono 5.20.0.217\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2019-02-16 08:06+0000\n"
|
||||
"POT-Creation-Date: 2019-02-19 08:08+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 @@
|
||||
8e5540dd0371f910cac2d287dd1784cde21fea26
|
||||
628651a44eae056b7f3aa222df5c9cdad7b889a4
|
Loading…
x
Reference in New Issue
Block a user