Merge branch 'upstream'
Former-commit-id: 1666728bf4b6bfbe07c181c7ca38867183c5eca8
This commit is contained in:
commit
35232dda62
@ -1 +1 @@
|
||||
f82402782c183a9b3d0d7ff8dcf09665fe659437
|
||||
bad7f5194ee248b1996a79e4d3c06f0d93073535
|
@ -1 +1 @@
|
||||
62d58e5ad09d9ee78241060e8c8fd498d658b690
|
||||
a2bfb06bdd6b174954323519b35119f067fab088
|
@ -34,7 +34,7 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.14.0.78";
|
||||
public const string MonoVersion = "5.14.0.81";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
@ -801,7 +801,7 @@ namespace System.Diagnostics
|
||||
if (startInfo.RedirectStandardOutput) {
|
||||
MonoIO.Close (stdout_write, out error);
|
||||
|
||||
Encoding stdoutEncoding = startInfo.StandardOutputEncoding ?? Console.Out.Encoding;
|
||||
Encoding stdoutEncoding = startInfo.StandardOutputEncoding ?? Console.OutputEncoding;
|
||||
|
||||
standardOutput = new StreamReader (new FileStream (stdout_read, FileAccess.Read, true, 8192), stdoutEncoding, true);
|
||||
}
|
||||
@ -809,7 +809,7 @@ namespace System.Diagnostics
|
||||
if (startInfo.RedirectStandardError) {
|
||||
MonoIO.Close (stderr_write, out error);
|
||||
|
||||
Encoding stderrEncoding = startInfo.StandardErrorEncoding ?? Console.Out.Encoding;
|
||||
Encoding stderrEncoding = startInfo.StandardErrorEncoding ?? Console.OutputEncoding;
|
||||
|
||||
standardError = new StreamReader (new FileStream (stderr_read, FileAccess.Read, true, 8192), stderrEncoding, true);
|
||||
}
|
||||
|
@ -1 +1 @@
|
||||
5bbdb28d177b6c7c5296146f8f6657911a17d9ff
|
||||
6f3f71c1cf5112b1d51747ba1c7d88485e63de8f
|
@ -1 +1 @@
|
||||
9084a538593186fa0b78b53c3f3c400a0b154888
|
||||
e74715fee1c1237cded6c578d6e96811514e10c3
|
@ -1 +1 @@
|
||||
4f982dd758484e7d9dedc80704686176254546fb
|
||||
2218f66703fe03ed897ab3a05be5f123230e8476
|
@ -1 +1 @@
|
||||
a84f3a5098c1badfd3c220a431fd598cb265fa66
|
||||
cee3d766b3432842682b9abf35f15abaca42bb0e
|
@ -1 +1 @@
|
||||
d9b67c8fe7d84716fdec7ad28c391b4622a68ee0
|
||||
c4fbdb7f2811f0459626d5d5e26e4980060a5db9
|
@ -1 +1 @@
|
||||
d256823b3e8007e1e37e92b2d0d8abb3a7ecc96c
|
||||
6c3985cf067e80c8f89524faba458cf7595582e1
|
@ -1 +1 @@
|
||||
d933cd10fd0abc9546eb2002618bc2ad19f3e9cb
|
||||
0d5f79705325be831a61476b8bf583be14422134
|
@ -1 +1 @@
|
||||
86cf695ef4ffb54b278a3115a93794a53a33607e
|
||||
8145e0b3651e4a04733818078ac7afc4b147efac
|
@ -1 +1 @@
|
||||
5bbdb28d177b6c7c5296146f8f6657911a17d9ff
|
||||
6f3f71c1cf5112b1d51747ba1c7d88485e63de8f
|
@ -1 +1 @@
|
||||
9084a538593186fa0b78b53c3f3c400a0b154888
|
||||
e74715fee1c1237cded6c578d6e96811514e10c3
|
@ -1 +1 @@
|
||||
4f982dd758484e7d9dedc80704686176254546fb
|
||||
2218f66703fe03ed897ab3a05be5f123230e8476
|
@ -1 +1 @@
|
||||
a84f3a5098c1badfd3c220a431fd598cb265fa66
|
||||
cee3d766b3432842682b9abf35f15abaca42bb0e
|
@ -1 +1 @@
|
||||
d9b67c8fe7d84716fdec7ad28c391b4622a68ee0
|
||||
c4fbdb7f2811f0459626d5d5e26e4980060a5db9
|
@ -1 +1 @@
|
||||
d256823b3e8007e1e37e92b2d0d8abb3a7ecc96c
|
||||
6c3985cf067e80c8f89524faba458cf7595582e1
|
@ -1 +1 @@
|
||||
d933cd10fd0abc9546eb2002618bc2ad19f3e9cb
|
||||
0d5f79705325be831a61476b8bf583be14422134
|
@ -1 +1 @@
|
||||
86cf695ef4ffb54b278a3115a93794a53a33607e
|
||||
8145e0b3651e4a04733818078ac7afc4b147efac
|
@ -1 +1 @@
|
||||
5bbdb28d177b6c7c5296146f8f6657911a17d9ff
|
||||
6f3f71c1cf5112b1d51747ba1c7d88485e63de8f
|
@ -1 +1 @@
|
||||
9084a538593186fa0b78b53c3f3c400a0b154888
|
||||
e74715fee1c1237cded6c578d6e96811514e10c3
|
@ -1 +1 @@
|
||||
4f982dd758484e7d9dedc80704686176254546fb
|
||||
2218f66703fe03ed897ab3a05be5f123230e8476
|
@ -1 +1 @@
|
||||
a84f3a5098c1badfd3c220a431fd598cb265fa66
|
||||
cee3d766b3432842682b9abf35f15abaca42bb0e
|
@ -1 +1 @@
|
||||
d9b67c8fe7d84716fdec7ad28c391b4622a68ee0
|
||||
c4fbdb7f2811f0459626d5d5e26e4980060a5db9
|
@ -1 +1 @@
|
||||
d256823b3e8007e1e37e92b2d0d8abb3a7ecc96c
|
||||
6c3985cf067e80c8f89524faba458cf7595582e1
|
@ -1 +1 @@
|
||||
d933cd10fd0abc9546eb2002618bc2ad19f3e9cb
|
||||
0d5f79705325be831a61476b8bf583be14422134
|
@ -1 +1 @@
|
||||
86cf695ef4ffb54b278a3115a93794a53a33607e
|
||||
8145e0b3651e4a04733818078ac7afc4b147efac
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/ecf6b88"
|
||||
#define FULL_VERSION "explicit/c4492e0"
|
||||
|
@ -1 +1 @@
|
||||
09e17da74e1e4895b6753068212820cf64201eb3
|
||||
260099917ff0898950dd42e0f55d3d640d7ff259
|
@ -1 +1 @@
|
||||
1ed852d2a81feaf7c07273397fa52351d11b9e66
|
||||
d656627cf5e27092e3d6120b6769040f8d3b5dec
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
1feb31f7be151e30f54404ea43f8cb670125e6f1
|
||||
8be3842d92b16f661d39d731af57fa803910863f
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
a3efed81e06c4045f08edc76a1b5b7af275e32df
|
||||
7e0344b0a770b77e8cceeb79516b6ed511a1281d
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
a5eb1ed04234970cdf14f5187748ec38dcd94c13
|
||||
9ac0e9564ef68c3084880ee04a9c35a543e5aa09
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 5.14.0.78\n"
|
||||
"Project-Id-Version: mono 5.14.0.81\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2018-05-10 08:12+0000\n"
|
||||
"POT-Creation-Date: 2018-05-11 08:17+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 @@
|
||||
cf44471948c1623f4f40e3443ef244a0001b69c0
|
||||
754e13034a82698fd4229a275b054507683088e9
|
Loading…
x
Reference in New Issue
Block a user