Merge branch 'upstream'
Former-commit-id: 117dc91d43789a29a717255116bcfacef451a26e
This commit is contained in:
commit
8b4888f130
@ -1 +1 @@
|
||||
8309317ee037a815f4ea5e0da21a8d295ac138bb
|
||||
3f0d7de26eb06e696651f0eb54e2feb5e8da4294
|
@ -1 +1 @@
|
||||
2c3da2055ed8d39e323b4772a7e8900bbdd57720
|
||||
891b77322f23307c9bf054b7c13d05d760b9f650
|
@ -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.132";
|
||||
public const string MonoVersion = "6.6.0.133";
|
||||
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 @@
|
||||
b1701237e1726c113994767f9ff62dae0ad15be1
|
||||
7c0fc742e67ebd432c14b6b616747368cbc5080a
|
@ -1 +1 @@
|
||||
b42f680dd14b9a67c596cee26b948bfc2a269239
|
||||
4aa0eea6dca3dbd14a424eb9a5fe3fc4b76cbd3f
|
@ -1 +1 @@
|
||||
b8eab7ac00058ebbd7a261a184698ccceb393eff
|
||||
0b9f8d1e37f9c05962c7898562f1f574dfabb0dc
|
@ -1 +1 @@
|
||||
eefd51c4ed6bdfd441a0cc7279769b9d9be2ae9f
|
||||
29cb409d7fba33bd16be5379f326276c7f810d0f
|
@ -1 +1 @@
|
||||
7fa4519772638afac2c70e0531ae91f2df7ec7ce
|
||||
19412dd30bb7279a59d82b7da07ccbe8307a1a3b
|
@ -1 +1 @@
|
||||
c73be7f9e1d55c4285ceab98cbe744370966d95b
|
||||
386226aa05d1283286ef664640d8cd9695907824
|
@ -1 +1 @@
|
||||
f7ffc5ce4b753f55f87c9fea6724206556f17a65
|
||||
83ac4ed1a4cb6da6e6796ecb5e8f44cef1be242c
|
@ -1 +1 @@
|
||||
b1701237e1726c113994767f9ff62dae0ad15be1
|
||||
7c0fc742e67ebd432c14b6b616747368cbc5080a
|
@ -1 +1 @@
|
||||
b42f680dd14b9a67c596cee26b948bfc2a269239
|
||||
4aa0eea6dca3dbd14a424eb9a5fe3fc4b76cbd3f
|
@ -1 +1 @@
|
||||
b8eab7ac00058ebbd7a261a184698ccceb393eff
|
||||
0b9f8d1e37f9c05962c7898562f1f574dfabb0dc
|
@ -1 +1 @@
|
||||
eefd51c4ed6bdfd441a0cc7279769b9d9be2ae9f
|
||||
29cb409d7fba33bd16be5379f326276c7f810d0f
|
@ -1 +1 @@
|
||||
7fa4519772638afac2c70e0531ae91f2df7ec7ce
|
||||
19412dd30bb7279a59d82b7da07ccbe8307a1a3b
|
@ -1 +1 @@
|
||||
c73be7f9e1d55c4285ceab98cbe744370966d95b
|
||||
386226aa05d1283286ef664640d8cd9695907824
|
@ -1 +1 @@
|
||||
f2712d86f018842e96448b2f8317601b046bda23
|
||||
eabf1317215f7103b2ee8a2347ba0fa285af848a
|
@ -1 +1 @@
|
||||
f7ffc5ce4b753f55f87c9fea6724206556f17a65
|
||||
83ac4ed1a4cb6da6e6796ecb5e8f44cef1be242c
|
@ -1 +1 @@
|
||||
b1701237e1726c113994767f9ff62dae0ad15be1
|
||||
7c0fc742e67ebd432c14b6b616747368cbc5080a
|
@ -1 +1 @@
|
||||
b42f680dd14b9a67c596cee26b948bfc2a269239
|
||||
4aa0eea6dca3dbd14a424eb9a5fe3fc4b76cbd3f
|
@ -1 +1 @@
|
||||
b8eab7ac00058ebbd7a261a184698ccceb393eff
|
||||
0b9f8d1e37f9c05962c7898562f1f574dfabb0dc
|
@ -1 +1 @@
|
||||
eefd51c4ed6bdfd441a0cc7279769b9d9be2ae9f
|
||||
29cb409d7fba33bd16be5379f326276c7f810d0f
|
@ -1 +1 @@
|
||||
7fa4519772638afac2c70e0531ae91f2df7ec7ce
|
||||
19412dd30bb7279a59d82b7da07ccbe8307a1a3b
|
@ -1 +1 @@
|
||||
c73be7f9e1d55c4285ceab98cbe744370966d95b
|
||||
386226aa05d1283286ef664640d8cd9695907824
|
@ -1 +1 @@
|
||||
f2712d86f018842e96448b2f8317601b046bda23
|
||||
eabf1317215f7103b2ee8a2347ba0fa285af848a
|
@ -1 +1 @@
|
||||
f7ffc5ce4b753f55f87c9fea6724206556f17a65
|
||||
83ac4ed1a4cb6da6e6796ecb5e8f44cef1be242c
|
@ -1 +1 @@
|
||||
b1701237e1726c113994767f9ff62dae0ad15be1
|
||||
7c0fc742e67ebd432c14b6b616747368cbc5080a
|
@ -1 +1 @@
|
||||
b42f680dd14b9a67c596cee26b948bfc2a269239
|
||||
4aa0eea6dca3dbd14a424eb9a5fe3fc4b76cbd3f
|
@ -1 +1 @@
|
||||
a7c89e56eb7b48d43dc0ea5446d4d9dbb545f2fd
|
||||
ba640b205bf9fb1e497b8e1ca68312b85a66d5b3
|
@ -1 +1 @@
|
||||
eefd51c4ed6bdfd441a0cc7279769b9d9be2ae9f
|
||||
29cb409d7fba33bd16be5379f326276c7f810d0f
|
@ -1 +1 @@
|
||||
7fa4519772638afac2c70e0531ae91f2df7ec7ce
|
||||
19412dd30bb7279a59d82b7da07ccbe8307a1a3b
|
@ -1 +1 @@
|
||||
c73be7f9e1d55c4285ceab98cbe744370966d95b
|
||||
386226aa05d1283286ef664640d8cd9695907824
|
@ -1 +1 @@
|
||||
f2712d86f018842e96448b2f8317601b046bda23
|
||||
eabf1317215f7103b2ee8a2347ba0fa285af848a
|
@ -1 +1 @@
|
||||
cb479d24ca55abba0832cc16409f772f009e4a59
|
||||
d704d5d4f1b92241acc54dd43a7dfd89c7079d01
|
@ -428,10 +428,7 @@ MonoProfilerCoverageInfo *
|
||||
mono_profiler_coverage_alloc (MonoMethod *method, guint32 entries)
|
||||
{
|
||||
if (!mono_profiler_state.code_coverage)
|
||||
return FALSE;
|
||||
|
||||
if (method->wrapper_type)
|
||||
return FALSE;
|
||||
return NULL;
|
||||
|
||||
if (!mono_profiler_coverage_instrumentation_enabled (method))
|
||||
return NULL;
|
||||
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/ef75d4b"
|
||||
#define FULL_VERSION "explicit/baa12e5"
|
||||
|
@ -691,6 +691,9 @@ coverage_filter (MonoProfiler *prof, MonoMethod *method)
|
||||
{
|
||||
guint32 iflags, flags;
|
||||
|
||||
if (method->wrapper_type)
|
||||
return FALSE;
|
||||
|
||||
flags = mono_method_get_flags (method, &iflags);
|
||||
|
||||
if ((iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) ||
|
||||
|
@ -525,8 +525,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 @@
|
||||
888303cf9e7e31ffaf4378aaf6e2c92d6f3617fd
|
||||
343ac949ba05c7f988fb08025570f6122b2f236b
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
c9d6c5de6821e892852d7762e7f3e08edabdc6a6
|
||||
be560d6ec27a6f268765e2bd4c498dfaa270a0e1
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
2d6e296b5d31b5190cdefc01b55398f71a5b8540
|
||||
ecbb0ae4fa6aff2c870b610c3de5ec12f714b14a
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 6.6.0.132\n"
|
||||
"Project-Id-Version: mono 6.6.0.133\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2019-10-22 08:32+0000\n"
|
||||
"POT-Creation-Date: 2019-10-23 08:29+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 @@
|
||||
8f47c2759172444b16b2f117b386fbebdeca7e29
|
||||
dc85ffcd2e8de040b54a5d4da1453718343aa1e8
|
Loading…
x
Reference in New Issue
Block a user