Merge branch 'upstream'
Former-commit-id: 3a8382acfc5bf3de98408f89dc473bd96f653956
This commit is contained in:
commit
7e64d23360
@ -1 +1 @@
|
||||
9840eda3e915e4ad624f62b24ab5fbc0766a3c0d
|
||||
0901a7a1da963229628e2b7b7bbc02f795393465
|
@ -1 +1 @@
|
||||
aac479edf738e3ecb1ea6b1127e1407f4db22fb6
|
||||
4cecb189bb8aa174e63de4efd89dce759af34f99
|
@ -34,7 +34,7 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.10.0.170";
|
||||
public const string MonoVersion = "5.10.0.172";
|
||||
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 @@
|
||||
c0da0dce9bf20100c7f4ab975037276cdbe89c08
|
||||
ed69f5344bf24ad11371839c02cf584071bc5a1f
|
@ -1 +1 @@
|
||||
55824e8b2ffa45040741cb8c958e830a6e166621
|
||||
6fc4e4a0161940e6807970124309b8791a0c4ee5
|
@ -1 +1 @@
|
||||
a822c9369ebff537de1caf4b5f901d65a427ac89
|
||||
826ebb8db593776dab1890974a881fd10b7c606c
|
@ -1 +1 @@
|
||||
8209901140c061f98d47be6566287ac0499aac19
|
||||
dad509233a0d0baafcaea8b99276fc5ee22e6d59
|
@ -1 +1 @@
|
||||
957702c72fa1f6c43aabfecb5ed549e5f6aa70a7
|
||||
f12880195e71882b7b5992035fc134edb5ec9d6e
|
@ -1 +1 @@
|
||||
eade14bf1279bc091045a1219949530e5b77503b
|
||||
79f200c96b97d760f7a77521232a791b116b286a
|
@ -1 +1 @@
|
||||
7c9efacd3728f855d15e98cff3d52fda072ccde3
|
||||
d55e55aa5abba620a8be8747ea0fabe61a4c3c4a
|
@ -1 +1 @@
|
||||
c0da0dce9bf20100c7f4ab975037276cdbe89c08
|
||||
ed69f5344bf24ad11371839c02cf584071bc5a1f
|
@ -1 +1 @@
|
||||
55824e8b2ffa45040741cb8c958e830a6e166621
|
||||
6fc4e4a0161940e6807970124309b8791a0c4ee5
|
@ -1 +1 @@
|
||||
a822c9369ebff537de1caf4b5f901d65a427ac89
|
||||
826ebb8db593776dab1890974a881fd10b7c606c
|
@ -1 +1 @@
|
||||
8209901140c061f98d47be6566287ac0499aac19
|
||||
dad509233a0d0baafcaea8b99276fc5ee22e6d59
|
@ -1 +1 @@
|
||||
957702c72fa1f6c43aabfecb5ed549e5f6aa70a7
|
||||
f12880195e71882b7b5992035fc134edb5ec9d6e
|
@ -1 +1 @@
|
||||
eade14bf1279bc091045a1219949530e5b77503b
|
||||
79f200c96b97d760f7a77521232a791b116b286a
|
@ -1 +1 @@
|
||||
7c9efacd3728f855d15e98cff3d52fda072ccde3
|
||||
d55e55aa5abba620a8be8747ea0fabe61a4c3c4a
|
@ -1 +1 @@
|
||||
c0da0dce9bf20100c7f4ab975037276cdbe89c08
|
||||
ed69f5344bf24ad11371839c02cf584071bc5a1f
|
@ -1 +1 @@
|
||||
55824e8b2ffa45040741cb8c958e830a6e166621
|
||||
6fc4e4a0161940e6807970124309b8791a0c4ee5
|
@ -1 +1 @@
|
||||
a822c9369ebff537de1caf4b5f901d65a427ac89
|
||||
826ebb8db593776dab1890974a881fd10b7c606c
|
@ -1 +1 @@
|
||||
8209901140c061f98d47be6566287ac0499aac19
|
||||
dad509233a0d0baafcaea8b99276fc5ee22e6d59
|
@ -1 +1 @@
|
||||
957702c72fa1f6c43aabfecb5ed549e5f6aa70a7
|
||||
f12880195e71882b7b5992035fc134edb5ec9d6e
|
@ -1 +1 @@
|
||||
eade14bf1279bc091045a1219949530e5b77503b
|
||||
79f200c96b97d760f7a77521232a791b116b286a
|
@ -1 +1 @@
|
||||
7c9efacd3728f855d15e98cff3d52fda072ccde3
|
||||
d55e55aa5abba620a8be8747ea0fabe61a4c3c4a
|
@ -1 +1 @@
|
||||
5378f08afc0d04de717f691e16266fa0879866f4
|
||||
747376a1b2b8aeb6ffcc236dd5320f5bf832d725
|
@ -1 +1 @@
|
||||
b2bae52ba61b8482455ccd7484e5dc1290538d3b
|
||||
9bdd6b5b7f9581d202295705465ed680495f6d2f
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/266326d"
|
||||
#define FULL_VERSION "explicit/4050681"
|
||||
|
@ -907,6 +907,9 @@ PROFILE_DISABLED_TESTS += \
|
||||
assemblyresolve_event3.exe \
|
||||
appdomain-serialize-exception.exe
|
||||
|
||||
PROFILE_DISABLED_TESTS += \
|
||||
delegate15.exe
|
||||
|
||||
# https://bugzilla.xamarin.com/show_bug.cgi?id=60973
|
||||
PROFILE_DISABLED_TESTS += \
|
||||
weak-fields.exe
|
||||
|
@ -1 +1 @@
|
||||
798d565c128d4c2d6653556ce82d6d1a36ee1467
|
||||
2c4b5fc1124b05fe96f152bc6589da0203e774cf
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
527224c2dc64f527e0cfe4fd5ed2c81fbea38471
|
||||
72e4f7f5078c89fa6f992012b9477ddfba30defc
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
c35efe0392b5525fa655ed8b29c31771a5a420cc
|
||||
f421b99fa76d7b600cf6badb1486a4bd5ebd3737
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
84ea27576663ea204e958d8a87a63bb357d7dcb1
|
||||
0f5d45c5274a3cc40742b701ff77b9379215145d
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 5.10.0.170\n"
|
||||
"Project-Id-Version: mono 5.10.0.172\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2018-03-09 08:27+0000\n"
|
||||
"POT-Creation-Date: 2018-03-13 08:41+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 @@
|
||||
36517b6c7cc7354be8b23b6b5a3fa0a6378abd44
|
||||
dd5653e16051eb460043b7fdd623b60904d023c3
|
Loading…
x
Reference in New Issue
Block a user