Merge branch 'upstream'
Former-commit-id: 955f503e9677a401e318282e149f336933018ae7
This commit is contained in:
commit
604a7f7b6a
@ -1 +1 @@
|
||||
eba57d5450053070dce90b75b8eb2e9fb354e537
|
||||
8f9d105af4a9f68eed64521e407923df5dcd59d2
|
@ -1 +1 @@
|
||||
d0c7db459ee67164a3f4c3dd24d9df3977e63ab8
|
||||
e1da4e425ca881ed9b3045f7c232af35f998c0b1
|
@ -41,7 +41,7 @@ static partial class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "6.4.0.194";
|
||||
public const string MonoVersion = "6.4.0.196";
|
||||
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 @@
|
||||
aeab8befa2acc173f50c51710a4112a022c4a809
|
||||
defb30ebe68510ef624f201b78a1028b8900ef49
|
@ -1 +1 @@
|
||||
7ca446d1eb7cd3bddcd05167868c0b2741ce3e17
|
||||
86bef9eafbbf4ee5cfbc43f0f8fb7b371415fa91
|
@ -1 +1 @@
|
||||
6b2bb697b159d57d869f43380ecac87b13ab1027
|
||||
89d2a7ab3c828aafc9a2b9e7581db77940064b96
|
@ -1 +1 @@
|
||||
95319c3eb884cd0f4c95a17bc7f478630a208ae5
|
||||
234254303adeba4b9f394653c1c63ef3c7dd2a46
|
@ -1 +1 @@
|
||||
0a605081002199665d9c9b28bb2f40193620e417
|
||||
7fb14ac8cefe2fd4034726a9372a63bf49c75ded
|
@ -1 +1 @@
|
||||
b7edbb82773e124a7fbcfb5cd1844ae456a33572
|
||||
8368316fc81d4e3991f72833420dd97a2eab4207
|
@ -1 +1 @@
|
||||
cba332b7141236f4d0e67a3b35cc1d42eaa9db04
|
||||
42ba836f633e19bc4b970cc91d11d5eb3eb75e28
|
@ -1 +1 @@
|
||||
aeab8befa2acc173f50c51710a4112a022c4a809
|
||||
defb30ebe68510ef624f201b78a1028b8900ef49
|
@ -1 +1 @@
|
||||
7ca446d1eb7cd3bddcd05167868c0b2741ce3e17
|
||||
86bef9eafbbf4ee5cfbc43f0f8fb7b371415fa91
|
@ -1 +1 @@
|
||||
6b2bb697b159d57d869f43380ecac87b13ab1027
|
||||
89d2a7ab3c828aafc9a2b9e7581db77940064b96
|
@ -1 +1 @@
|
||||
95319c3eb884cd0f4c95a17bc7f478630a208ae5
|
||||
234254303adeba4b9f394653c1c63ef3c7dd2a46
|
@ -1 +1 @@
|
||||
0a605081002199665d9c9b28bb2f40193620e417
|
||||
7fb14ac8cefe2fd4034726a9372a63bf49c75ded
|
@ -1 +1 @@
|
||||
b7edbb82773e124a7fbcfb5cd1844ae456a33572
|
||||
8368316fc81d4e3991f72833420dd97a2eab4207
|
@ -1 +1 @@
|
||||
b627ff92a95640b43c7d99030cdd8edf87215ba8
|
||||
d09d094feed27b627df1d39f7213d3a63e13d0f9
|
@ -1 +1 @@
|
||||
cba332b7141236f4d0e67a3b35cc1d42eaa9db04
|
||||
42ba836f633e19bc4b970cc91d11d5eb3eb75e28
|
@ -1 +1 @@
|
||||
aeab8befa2acc173f50c51710a4112a022c4a809
|
||||
defb30ebe68510ef624f201b78a1028b8900ef49
|
@ -1 +1 @@
|
||||
7ca446d1eb7cd3bddcd05167868c0b2741ce3e17
|
||||
86bef9eafbbf4ee5cfbc43f0f8fb7b371415fa91
|
@ -1 +1 @@
|
||||
6b2bb697b159d57d869f43380ecac87b13ab1027
|
||||
89d2a7ab3c828aafc9a2b9e7581db77940064b96
|
@ -1 +1 @@
|
||||
95319c3eb884cd0f4c95a17bc7f478630a208ae5
|
||||
234254303adeba4b9f394653c1c63ef3c7dd2a46
|
@ -1 +1 @@
|
||||
0a605081002199665d9c9b28bb2f40193620e417
|
||||
7fb14ac8cefe2fd4034726a9372a63bf49c75ded
|
@ -1 +1 @@
|
||||
b7edbb82773e124a7fbcfb5cd1844ae456a33572
|
||||
8368316fc81d4e3991f72833420dd97a2eab4207
|
@ -1 +1 @@
|
||||
b627ff92a95640b43c7d99030cdd8edf87215ba8
|
||||
d09d094feed27b627df1d39f7213d3a63e13d0f9
|
@ -1 +1 @@
|
||||
cba332b7141236f4d0e67a3b35cc1d42eaa9db04
|
||||
42ba836f633e19bc4b970cc91d11d5eb3eb75e28
|
@ -1 +1 @@
|
||||
aeab8befa2acc173f50c51710a4112a022c4a809
|
||||
defb30ebe68510ef624f201b78a1028b8900ef49
|
@ -1 +1 @@
|
||||
7ca446d1eb7cd3bddcd05167868c0b2741ce3e17
|
||||
86bef9eafbbf4ee5cfbc43f0f8fb7b371415fa91
|
@ -1 +1 @@
|
||||
b1c5485e1d9a2b2e5873c4604b1b1eaa6c0b5865
|
||||
75f6c4135c7af76cb351857ec1d84ab54ac6465e
|
@ -1 +1 @@
|
||||
95319c3eb884cd0f4c95a17bc7f478630a208ae5
|
||||
234254303adeba4b9f394653c1c63ef3c7dd2a46
|
@ -1 +1 @@
|
||||
0a605081002199665d9c9b28bb2f40193620e417
|
||||
7fb14ac8cefe2fd4034726a9372a63bf49c75ded
|
@ -1 +1 @@
|
||||
b7edbb82773e124a7fbcfb5cd1844ae456a33572
|
||||
8368316fc81d4e3991f72833420dd97a2eab4207
|
@ -1 +1 @@
|
||||
b627ff92a95640b43c7d99030cdd8edf87215ba8
|
||||
d09d094feed27b627df1d39f7213d3a63e13d0f9
|
@ -1 +1 @@
|
||||
3c6daec5292104beae0a5586091ef749b24bd63d
|
||||
dae7dc2a54ac5939b1ff8f5369b320d0c1010510
|
@ -1 +1 @@
|
||||
ea478d171437f622c91986a13bad6bf4a3080fe8
|
||||
f3f16d92941ddf6393cdb76e02d88e050ff28c89
|
@ -1 +1 @@
|
||||
186cf8c4065c20b4655cf1d9d1e30fa514321858
|
||||
0c5ec34aba59c86f57e40cbadae76fd7c1d33f79
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/7da9a04"
|
||||
#define FULL_VERSION "explicit/1648e88"
|
||||
|
@ -1491,10 +1491,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@clean-local:
|
||||
@HOST_WIN32_TRUE@clean-local:
|
||||
@CROSS_COMPILE_TRUE@test-local:
|
||||
@HOST_WIN32_TRUE@test-local:
|
||||
@CROSS_COMPILE_TRUE@clean-local:
|
||||
@HOST_WIN32_TRUE@clean-local:
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \
|
||||
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
a898e28f022a503d2865909afbfcf80a7df162b6
|
||||
cc5ce0347705822f704f71709145aaeaef6263cb
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
0d4c720e37418c1326adad6130b104fdc383e6fe
|
||||
ccd71281ed0ab4bf1a00015ee18fbddaee02f1a2
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
b4394adea00c4c47f6f12a1d71341bb3e50254c1
|
||||
972921399c1759b0f9eb365fb36c103229b565bd
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 6.4.0.194\n"
|
||||
"Project-Id-Version: mono 6.4.0.196\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2019-09-13 08:22+0000\n"
|
||||
"POT-Creation-Date: 2019-09-18 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 @@
|
||||
4dc4021bcaa7e002b90bed43d8b708e2171f5a02
|
||||
08a4e805bbc1dc8ab14f832760736e62c43dbacb
|
Loading…
x
Reference in New Issue
Block a user