Merge branch 'upstream'
Former-commit-id: 89173d6b1170e5661e22fe8b76fa6a85b5ca0db3
This commit is contained in:
commit
7cb93c87c3
@ -1 +1 @@
|
||||
b7f194e52948982f6df42beb9d6d0947176c7be3
|
||||
c0a4f58ff1b75ef65a8156b6c3d6ba00459db557
|
@ -1 +1 @@
|
||||
e6bc719997f4e98ced599e076da0e9febcfd81c7
|
||||
0f53a6fdd48fe5341a3853b2a3cd9b4a2eed4553
|
@ -41,7 +41,7 @@ static partial class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "6.6.0.154";
|
||||
public const string MonoVersion = "6.6.0.156";
|
||||
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 @@
|
||||
0bee7b079583d42ea2b37cc5fce0530986562212
|
||||
f7f3eebf2f5fe10c3afcdb704b19ca2c0dcdb9d6
|
@ -1 +1 @@
|
||||
10207e20d0431146a4132f21b87d365c49c752e8
|
||||
ac20f44d33ee6027bf91b532a3bf4d4b3e21594d
|
@ -1 +1 @@
|
||||
038c9a3e6e49e8d959dffe1eace20476d7a7d536
|
||||
2438ba97cd7d0918faf0f87f4732143d6c20d70f
|
@ -1 +1 @@
|
||||
390dc51ece540a4329b1712b04272e3ca89cbb97
|
||||
67ff92fa72dff268bd6653f0e6651089fc49d59c
|
@ -1 +1 @@
|
||||
f2b1ebaf93397a631346ba61abde037bdb077307
|
||||
80f2b52b14d3eeff2418d751958153880f9c7c51
|
@ -1 +1 @@
|
||||
e4a2b91a75ac79a1ff8ff58d2debaf27dfcc6071
|
||||
fa80a645334c2b2ce50207db3f02dfc8b8356df7
|
@ -1 +1 @@
|
||||
a00e4c990b74d25ef29a4f74225cbcb9edcc74d3
|
||||
4edd68340a5df2fc5dad4d2616dd7e3eb6226f34
|
@ -1 +1 @@
|
||||
0bee7b079583d42ea2b37cc5fce0530986562212
|
||||
f7f3eebf2f5fe10c3afcdb704b19ca2c0dcdb9d6
|
@ -1 +1 @@
|
||||
10207e20d0431146a4132f21b87d365c49c752e8
|
||||
ac20f44d33ee6027bf91b532a3bf4d4b3e21594d
|
@ -1 +1 @@
|
||||
038c9a3e6e49e8d959dffe1eace20476d7a7d536
|
||||
2438ba97cd7d0918faf0f87f4732143d6c20d70f
|
@ -1 +1 @@
|
||||
390dc51ece540a4329b1712b04272e3ca89cbb97
|
||||
67ff92fa72dff268bd6653f0e6651089fc49d59c
|
@ -1 +1 @@
|
||||
f2b1ebaf93397a631346ba61abde037bdb077307
|
||||
80f2b52b14d3eeff2418d751958153880f9c7c51
|
@ -1 +1 @@
|
||||
e4a2b91a75ac79a1ff8ff58d2debaf27dfcc6071
|
||||
fa80a645334c2b2ce50207db3f02dfc8b8356df7
|
@ -1 +1 @@
|
||||
1d5312dd5952b463bf012bb8bce6fed2048cdea2
|
||||
8f5971af97e2d3d63223aec3a6b3b589619b4268
|
@ -1 +1 @@
|
||||
a00e4c990b74d25ef29a4f74225cbcb9edcc74d3
|
||||
4edd68340a5df2fc5dad4d2616dd7e3eb6226f34
|
@ -1 +1 @@
|
||||
0bee7b079583d42ea2b37cc5fce0530986562212
|
||||
f7f3eebf2f5fe10c3afcdb704b19ca2c0dcdb9d6
|
@ -1 +1 @@
|
||||
10207e20d0431146a4132f21b87d365c49c752e8
|
||||
ac20f44d33ee6027bf91b532a3bf4d4b3e21594d
|
@ -1 +1 @@
|
||||
038c9a3e6e49e8d959dffe1eace20476d7a7d536
|
||||
2438ba97cd7d0918faf0f87f4732143d6c20d70f
|
@ -1 +1 @@
|
||||
390dc51ece540a4329b1712b04272e3ca89cbb97
|
||||
67ff92fa72dff268bd6653f0e6651089fc49d59c
|
@ -1 +1 @@
|
||||
f2b1ebaf93397a631346ba61abde037bdb077307
|
||||
80f2b52b14d3eeff2418d751958153880f9c7c51
|
@ -1 +1 @@
|
||||
e4a2b91a75ac79a1ff8ff58d2debaf27dfcc6071
|
||||
fa80a645334c2b2ce50207db3f02dfc8b8356df7
|
@ -1 +1 @@
|
||||
1d5312dd5952b463bf012bb8bce6fed2048cdea2
|
||||
8f5971af97e2d3d63223aec3a6b3b589619b4268
|
@ -1 +1 @@
|
||||
a00e4c990b74d25ef29a4f74225cbcb9edcc74d3
|
||||
4edd68340a5df2fc5dad4d2616dd7e3eb6226f34
|
@ -1 +1 @@
|
||||
0bee7b079583d42ea2b37cc5fce0530986562212
|
||||
f7f3eebf2f5fe10c3afcdb704b19ca2c0dcdb9d6
|
@ -1 +1 @@
|
||||
10207e20d0431146a4132f21b87d365c49c752e8
|
||||
ac20f44d33ee6027bf91b532a3bf4d4b3e21594d
|
@ -1 +1 @@
|
||||
0516c9fc5c4d87440a21b5eb38a1e73a3dfb29c7
|
||||
32050367c3c1ea5b1d3e3189d2772dda5985cb84
|
@ -1 +1 @@
|
||||
390dc51ece540a4329b1712b04272e3ca89cbb97
|
||||
67ff92fa72dff268bd6653f0e6651089fc49d59c
|
@ -1 +1 @@
|
||||
f2b1ebaf93397a631346ba61abde037bdb077307
|
||||
80f2b52b14d3eeff2418d751958153880f9c7c51
|
@ -1 +1 @@
|
||||
e4a2b91a75ac79a1ff8ff58d2debaf27dfcc6071
|
||||
fa80a645334c2b2ce50207db3f02dfc8b8356df7
|
@ -1 +1 @@
|
||||
1d5312dd5952b463bf012bb8bce6fed2048cdea2
|
||||
8f5971af97e2d3d63223aec3a6b3b589619b4268
|
@ -1 +1 @@
|
||||
abbf7cb5d947d5854c3adb832af112d252287566
|
||||
5a2599e6cf39f835c6ab6f7fed32e8ed25f3dcb1
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/e59c3fb"
|
||||
#define FULL_VERSION "explicit/a77128c"
|
||||
|
@ -1496,10 +1496,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 \
|
||||
|
@ -341,7 +341,6 @@ mono_merp_send (MERPStruct *merp)
|
||||
exit (-1);
|
||||
} else {
|
||||
int status;
|
||||
waitpid (pid, &status, 0);
|
||||
int exit_status = FALSE;
|
||||
|
||||
while (TRUE) {
|
||||
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
f2f4149c97ddb42ca0299ce5eceb0d67b5455e54
|
||||
8a7e0710379510bc5c01c66478e88d4878cea5aa
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
b5bd9c1534d8765acc7c39d0e455910a7c70ab90
|
||||
29abe956876f3e814166d548e3a22f67dca3667f
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
dbaf0129862f081f6bb538a6f27e7609a81e5f1e
|
||||
f63727d0d649742750ed08909c19b3dbba2837e9
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 6.6.0.154\n"
|
||||
"Project-Id-Version: mono 6.6.0.156\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2019-11-07 08:30+0000\n"
|
||||
"POT-Creation-Date: 2019-11-15 08:30+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 @@
|
||||
742f50e7cb6b68bf707878acae3f0136b84651ab
|
||||
b086e9f48bdb8591366eda4d4456c81fb57b44be
|
Loading…
x
Reference in New Issue
Block a user