Merge branch 'upstream'
Former-commit-id: 5b78b007fccc0d014f29da02324434b3c9b2b645
This commit is contained in:
commit
aa29d5403f
@ -1 +1 @@
|
||||
88ae40fc58a5310e60c827d644a6ae69ac155d4e
|
||||
47a71503ad4b11956a23560ed811f6bb076b62ca
|
@ -1 +1 @@
|
||||
0346879ad8ae4821c830eca067aaa7e6b3c03ea9
|
||||
dcc2e4a5df31f6452354a2e366e400f4b9f092d1
|
@ -41,7 +41,7 @@ static partial class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "6.0.0.197";
|
||||
public const string MonoVersion = "6.0.0.198";
|
||||
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 @@
|
||||
6ea3ae9edc197662299ca0d3075e685019a7b8dd
|
||||
aa7f97033e5a13bb9cf6bb0cb1ff5a17302fb6c0
|
@ -1 +1 @@
|
||||
f1a222b408068895f22724347ada81b5003d862f
|
||||
bea941d874dd4784a679cc458ce856ccf9e0deda
|
@ -1 +1 @@
|
||||
e1e7132d5b1c9a2ee55b7bdb9806d30084653ba6
|
||||
7d89df00999623f2e9930629925a7fc42015b045
|
Binary file not shown.
@ -1 +1 @@
|
||||
7c33198f69feeb6579e3f58225e1f0e8ac7124ea
|
||||
148e032f3c68a850e387040ad23de7b26b9ed71f
|
@ -1 +1 @@
|
||||
573311b27754edd7471b26643bd8eeffa55b5b89
|
||||
9f6b5684d29e65a42e837c8a80aa8e621919ad44
|
@ -1 +1 @@
|
||||
e73142283b03345f330630803b4c58749bad9117
|
||||
388ea3de18abe0e34263f802d378229d8ce8b88b
|
@ -1 +1 @@
|
||||
61c024d204a54a55f550964baa702d5517a1a4c0
|
||||
ea56610502a494d395b9db809fe702dd63e76dcb
|
@ -1 +1 @@
|
||||
6ea3ae9edc197662299ca0d3075e685019a7b8dd
|
||||
aa7f97033e5a13bb9cf6bb0cb1ff5a17302fb6c0
|
@ -1 +1 @@
|
||||
f1a222b408068895f22724347ada81b5003d862f
|
||||
bea941d874dd4784a679cc458ce856ccf9e0deda
|
@ -1 +1 @@
|
||||
e1e7132d5b1c9a2ee55b7bdb9806d30084653ba6
|
||||
7d89df00999623f2e9930629925a7fc42015b045
|
Binary file not shown.
@ -1 +1 @@
|
||||
7c33198f69feeb6579e3f58225e1f0e8ac7124ea
|
||||
148e032f3c68a850e387040ad23de7b26b9ed71f
|
@ -1 +1 @@
|
||||
573311b27754edd7471b26643bd8eeffa55b5b89
|
||||
9f6b5684d29e65a42e837c8a80aa8e621919ad44
|
@ -1 +1 @@
|
||||
e73142283b03345f330630803b4c58749bad9117
|
||||
388ea3de18abe0e34263f802d378229d8ce8b88b
|
@ -1 +1 @@
|
||||
61c024d204a54a55f550964baa702d5517a1a4c0
|
||||
ea56610502a494d395b9db809fe702dd63e76dcb
|
@ -1 +1 @@
|
||||
6ea3ae9edc197662299ca0d3075e685019a7b8dd
|
||||
aa7f97033e5a13bb9cf6bb0cb1ff5a17302fb6c0
|
@ -1 +1 @@
|
||||
f1a222b408068895f22724347ada81b5003d862f
|
||||
bea941d874dd4784a679cc458ce856ccf9e0deda
|
@ -1 +1 @@
|
||||
e1e7132d5b1c9a2ee55b7bdb9806d30084653ba6
|
||||
7d89df00999623f2e9930629925a7fc42015b045
|
Binary file not shown.
@ -1 +1 @@
|
||||
7c33198f69feeb6579e3f58225e1f0e8ac7124ea
|
||||
148e032f3c68a850e387040ad23de7b26b9ed71f
|
@ -1 +1 @@
|
||||
573311b27754edd7471b26643bd8eeffa55b5b89
|
||||
9f6b5684d29e65a42e837c8a80aa8e621919ad44
|
@ -1 +1 @@
|
||||
e73142283b03345f330630803b4c58749bad9117
|
||||
388ea3de18abe0e34263f802d378229d8ce8b88b
|
@ -1 +1 @@
|
||||
61c024d204a54a55f550964baa702d5517a1a4c0
|
||||
ea56610502a494d395b9db809fe702dd63e76dcb
|
@ -1 +1 @@
|
||||
6ea3ae9edc197662299ca0d3075e685019a7b8dd
|
||||
aa7f97033e5a13bb9cf6bb0cb1ff5a17302fb6c0
|
@ -1 +1 @@
|
||||
f1a222b408068895f22724347ada81b5003d862f
|
||||
bea941d874dd4784a679cc458ce856ccf9e0deda
|
@ -1 +1 @@
|
||||
193d4bb6e5f0a0a27f21b67f27b055e90baa524e
|
||||
e4d97e4cb4bb4676e185d861435e1b1b6ba5bd7b
|
Binary file not shown.
@ -1 +1 @@
|
||||
7c33198f69feeb6579e3f58225e1f0e8ac7124ea
|
||||
148e032f3c68a850e387040ad23de7b26b9ed71f
|
@ -1 +1 @@
|
||||
573311b27754edd7471b26643bd8eeffa55b5b89
|
||||
9f6b5684d29e65a42e837c8a80aa8e621919ad44
|
@ -1 +1 @@
|
||||
e73142283b03345f330630803b4c58749bad9117
|
||||
388ea3de18abe0e34263f802d378229d8ce8b88b
|
@ -1 +1 @@
|
||||
2b575d9d26085da4c65dd293c405e04300a3ed5f
|
||||
1d1a9754a800c162d804ff68354cd28a61403e1e
|
@ -1 +1 @@
|
||||
e336b682d079a24db251bce9846dd56faea26341
|
||||
aa050833a2dbe0071c8238825140aadc179ae7ff
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/c7ae311"
|
||||
#define FULL_VERSION "explicit/0157e9e"
|
||||
|
@ -1442,10 +1442,10 @@ distclean-generic:
|
||||
maintainer-clean-generic:
|
||||
@echo "This command is intended for maintainers to use"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
@CROSS_COMPILE_TRUE@test-local:
|
||||
@HOST_WIN32_TRUE@test-local:
|
||||
@CROSS_COMPILE_TRUE@clean-local:
|
||||
@HOST_WIN32_TRUE@clean-local:
|
||||
@CROSS_COMPILE_TRUE@test-local:
|
||||
@HOST_WIN32_TRUE@test-local:
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \
|
||||
|
@ -515,8 +515,8 @@ distclean-generic:
|
||||
maintainer-clean-generic:
|
||||
@echo "This command is intended for maintainers to use"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
@ENABLE_MSVC_FALSE@clean-local:
|
||||
@ENABLE_MSVC_FALSE@install-exec-local:
|
||||
@ENABLE_MSVC_FALSE@clean-local:
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-generic clean-libtool clean-local mostlyclean-am
|
||||
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
e39b0993abc1a46d646dd618f0b44c75c5bb68b8
|
||||
27c7b099184a7edc1cee97590c8a4d3b29ce0338
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
7cfb4b19643ac25f379b14c7ddfc9b313b2fac0c
|
||||
0907dc83c88085e4b15b8a2373d45bd3ee1c18c9
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
9e382306678f9606244ff855babac1bccc131914
|
||||
ebde652dd49553313b4072c27a010c796de78d25
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 6.0.0.197\n"
|
||||
"Project-Id-Version: mono 6.0.0.198\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2019-04-25 08:07+0000\n"
|
||||
"POT-Creation-Date: 2019-04-26 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"
|
||||
|
BIN
po/mcs/pt_BR.gmo
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
5e28ab9b9e9b7e836e81ef2899fee5f7ca7802d3
|
||||
53bc4cc54441ec48df6ecfc223916f60f7bc0f94
|
Loading…
x
Reference in New Issue
Block a user