diff --git a/config.h.in b/config.h.in index b54e010bc9..90d71a108f 100644 --- a/config.h.in +++ b/config.h.in @@ -219,12 +219,6 @@ /* Use classic Windows API support */ #undef HAVE_CLASSIC_WINAPI_SUPPORT -/* CLOCK_MONOTONIC */ -#undef HAVE_CLOCK_MONOTONIC - -/* CLOCK_MONOTONIC_COARSE */ -#undef HAVE_CLOCK_MONOTONIC_COARSE - /* Define to 1 if you have the `clock_nanosleep' function. */ #undef HAVE_CLOCK_NANOSLEEP @@ -389,9 +383,6 @@ /* Define to 1 if you have the `gethostid' function. */ #undef HAVE_GETHOSTID -/* gethrtime */ -#undef HAVE_GETHRTIME - /* Have getifaddrs */ #undef HAVE_GETIFADDRS @@ -542,9 +533,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MACHINE_ENDIAN_H -/* mach_absolute_time */ -#undef HAVE_MACH_ABSOLUTE_TIME - /* Define to 1 if you have the `madvise' function. */ #undef HAVE_MADVISE @@ -669,9 +657,6 @@ /* Define to 1 if you have the `readv' function. */ #undef HAVE_READV -/* read_real_time */ -#undef HAVE_READ_REAL_TIME - /* Define to 1 if you have the `remap_file_pages' function. */ #undef HAVE_REMAP_FILE_PAGES diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 6e4cb4e792..3d0ddf527e 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -076c7f7ea710f371f2b456306d293464fb64345c \ No newline at end of file +8a49b44278fc8f5f287833024b38e31783fab28b \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 58c223a87e..3394d21e25 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -3dfc7bdce20df1f718af232b5a9e164e9cbc125c \ No newline at end of file +c67a9efcce1d756bd7755aae18cce1416c49542d \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 9b7112be4d..e6be929ae2 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -34,7 +34,7 @@ static class Consts // Use these assembly version constants to make code more maintainable. // - public const string MonoVersion = "5.10.1.2"; + public const string MonoVersion = "5.10.1.4"; public const string MonoCompany = "Mono development team"; public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoCopyright = "(c) Various Mono authors"; diff --git a/mcs/class/lib/monolite-darwin/1051000003/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/Mono.Security.dll.REMOVED.git-id index cf74bac7b9..d320b03fd7 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -782ff3108fa8594e8f79418d1c0a5493c1f41b9e \ No newline at end of file +632ffa63e9d733d1fa7e85288e669c7f3c0a961a \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/System.Configuration.dll.REMOVED.git-id index 7a169fd711..503177c37d 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -397304064b2cf8faea733540adc178294323fa7c \ No newline at end of file +74210b34f12491fef9f55d7f8c9ed8fc29d01a37 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/System.Numerics.dll.REMOVED.git-id index fb652f473c..1355b1c365 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -a55d25fffd32c53abee6c9c5f1754b59e2bbe3ea \ No newline at end of file +82f130c85c572806b2dfd30c0406a671d5821476 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/System.Security.dll.REMOVED.git-id index 5f61f0a9f6..749995173e 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -b13ba9b6351fc5188afd7b6f83a6a9c0a4844730 \ No newline at end of file +c5c35be810d44e629cfde3a5bb1a7f349529711d \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/System.Xml.dll.REMOVED.git-id index b9b04549fb..10c301b6ff 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -00489f90d93ff78c4a085a84390061140e81a9af \ No newline at end of file +c16b35960e6d2f8cf7297971db20ee4d6505166b \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/mcs.exe.REMOVED.git-id index af7dbbbea8..af72db03b5 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -a43fee480db4e61c27d272bea6ba535d161d1cc2 \ No newline at end of file +aad7272a54bf569f27d3bc8484f8656d648a1111 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/mscorlib.dll.REMOVED.git-id index def4f016c0..7769e8173a 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -fe973d5afdbe89f4e0d1767946f3fb69d9f2eb6f \ No newline at end of file +5a49425c0eec7a0194b51366746eed914c57f302 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/Mono.Security.dll.REMOVED.git-id index cf74bac7b9..d320b03fd7 100644 --- a/mcs/class/lib/monolite-linux/1051000003/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -782ff3108fa8594e8f79418d1c0a5493c1f41b9e \ No newline at end of file +632ffa63e9d733d1fa7e85288e669c7f3c0a961a \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/System.Configuration.dll.REMOVED.git-id index 7a169fd711..503177c37d 100644 --- a/mcs/class/lib/monolite-linux/1051000003/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -397304064b2cf8faea733540adc178294323fa7c \ No newline at end of file +74210b34f12491fef9f55d7f8c9ed8fc29d01a37 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/System.Numerics.dll.REMOVED.git-id index fb652f473c..1355b1c365 100644 --- a/mcs/class/lib/monolite-linux/1051000003/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -a55d25fffd32c53abee6c9c5f1754b59e2bbe3ea \ No newline at end of file +82f130c85c572806b2dfd30c0406a671d5821476 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/System.Security.dll.REMOVED.git-id index 5f61f0a9f6..749995173e 100644 --- a/mcs/class/lib/monolite-linux/1051000003/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -b13ba9b6351fc5188afd7b6f83a6a9c0a4844730 \ No newline at end of file +c5c35be810d44e629cfde3a5bb1a7f349529711d \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/System.Xml.dll.REMOVED.git-id index b9b04549fb..10c301b6ff 100644 --- a/mcs/class/lib/monolite-linux/1051000003/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -00489f90d93ff78c4a085a84390061140e81a9af \ No newline at end of file +c16b35960e6d2f8cf7297971db20ee4d6505166b \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id index af7dbbbea8..af72db03b5 100644 --- a/mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -a43fee480db4e61c27d272bea6ba535d161d1cc2 \ No newline at end of file +aad7272a54bf569f27d3bc8484f8656d648a1111 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id index def4f016c0..7769e8173a 100644 --- a/mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -fe973d5afdbe89f4e0d1767946f3fb69d9f2eb6f \ No newline at end of file +5a49425c0eec7a0194b51366746eed914c57f302 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/Mono.Security.dll.REMOVED.git-id index cf74bac7b9..d320b03fd7 100644 --- a/mcs/class/lib/monolite-win32/1051000003/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -782ff3108fa8594e8f79418d1c0a5493c1f41b9e \ No newline at end of file +632ffa63e9d733d1fa7e85288e669c7f3c0a961a \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/System.Configuration.dll.REMOVED.git-id index 7a169fd711..503177c37d 100644 --- a/mcs/class/lib/monolite-win32/1051000003/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -397304064b2cf8faea733540adc178294323fa7c \ No newline at end of file +74210b34f12491fef9f55d7f8c9ed8fc29d01a37 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/System.Numerics.dll.REMOVED.git-id index fb652f473c..1355b1c365 100644 --- a/mcs/class/lib/monolite-win32/1051000003/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -a55d25fffd32c53abee6c9c5f1754b59e2bbe3ea \ No newline at end of file +82f130c85c572806b2dfd30c0406a671d5821476 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/System.Security.dll.REMOVED.git-id index 5f61f0a9f6..749995173e 100644 --- a/mcs/class/lib/monolite-win32/1051000003/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -b13ba9b6351fc5188afd7b6f83a6a9c0a4844730 \ No newline at end of file +c5c35be810d44e629cfde3a5bb1a7f349529711d \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/System.Xml.dll.REMOVED.git-id index b9b04549fb..10c301b6ff 100644 --- a/mcs/class/lib/monolite-win32/1051000003/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -00489f90d93ff78c4a085a84390061140e81a9af \ No newline at end of file +c16b35960e6d2f8cf7297971db20ee4d6505166b \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/mcs.exe.REMOVED.git-id index af7dbbbea8..af72db03b5 100644 --- a/mcs/class/lib/monolite-win32/1051000003/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -a43fee480db4e61c27d272bea6ba535d161d1cc2 \ No newline at end of file +aad7272a54bf569f27d3bc8484f8656d648a1111 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/mscorlib.dll.REMOVED.git-id index def4f016c0..7769e8173a 100644 --- a/mcs/class/lib/monolite-win32/1051000003/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -fe973d5afdbe89f4e0d1767946f3fb69d9f2eb6f \ No newline at end of file +5a49425c0eec7a0194b51366746eed914c57f302 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index e82815cb5f..871515cbf6 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/225ba3e" +#define FULL_VERSION "explicit/47631c3" diff --git a/mono/sgen/sgen-memory-governor.c b/mono/sgen/sgen-memory-governor.c index 12c775a238..ab9b254e6c 100644 --- a/mono/sgen/sgen-memory-governor.c +++ b/mono/sgen/sgen-memory-governor.c @@ -23,7 +23,13 @@ #include "mono/sgen/sgen-workers.h" #include "mono/sgen/sgen-client.h" -#define MIN_MINOR_COLLECTION_ALLOWANCE ((mword)(SGEN_DEFAULT_NURSERY_SIZE * default_allowance_nursery_size_ratio)) +/* + * The allowance we are targeting is a third of the current heap size. Still, we + * allow the heap to grow at least 4 times the nursery size before triggering a + * major, to reduce unnecessary collections. We make sure we don't set the minimum + * allowance too high when using a soft heap limit. + */ +#define MIN_MINOR_COLLECTION_ALLOWANCE (MIN(((mword)(sgen_nursery_size * default_allowance_nursery_size_ratio)), (soft_heap_limit * SGEN_DEFAULT_ALLOWANCE_HEAP_SIZE_RATIO))) static SgenPointerQueue log_entries = SGEN_POINTER_QUEUE_INIT (INTERNAL_MEM_TEMPORARY); static mono_mutex_t log_entries_mutex; diff --git a/mono/utils/mono-time.c b/mono/utils/mono-time.c index d7089eae83..4a3b270556 100644 --- a/mono/utils/mono-time.c +++ b/mono/utils/mono-time.c @@ -9,7 +9,6 @@ #include #include #include -#include #ifdef HAVE_SYS_TIME_H #include @@ -20,18 +19,6 @@ #define MTICKS_PER_SEC (10 * 1000 * 1000) -typedef enum _TimeConversionConstants -{ - tccSecondsToMillieSeconds = 1000, // 10^3 - tccSecondsToMicroSeconds = 1000000, // 10^6 - tccSecondsToNanoSeconds = 1000000000, // 10^9 - tccMillieSecondsToMicroSeconds = 1000, // 10^3 - tccMillieSecondsToNanoSeconds = 1000000, // 10^6 - tccMicroSecondsToNanoSeconds = 1000, // 10^3 - tccSecondsTo100NanoSeconds = 10000000, // 10^7 - tccMicroSecondsTo100NanoSeconds = 10 // 10^1 -} TimeConversionConstants; - gint64 mono_msec_ticks (void) { @@ -139,57 +126,16 @@ get_boot_time (void) } /* Returns the number of milliseconds from boot time: this should be monotonic */ -/* Adapted from CoreCLR: https://github.com/dotnet/coreclr/blob/66d2738ea96fcce753dec1370e79a0c78f7b6adb/src/pal/src/misc/time.cpp */ gint64 mono_msec_boottime (void) { - gint64 retval = 0; - -#if HAVE_CLOCK_MONOTONIC_COARSE || HAVE_CLOCK_MONOTONIC - clockid_t clockType = -#if HAVE_CLOCK_MONOTONIC_COARSE - CLOCK_MONOTONIC_COARSE; /* good enough resolution, fastest speed */ -#else - CLOCK_MONOTONIC; -#endif - struct timespec ts; - if (clock_gettime (clockType, &ts) != 0) { - g_error ("clock_gettime(CLOCK_MONOTONIC*) failed; errno is %d", errno, strerror (errno)); - goto exit; - } - retval = (ts.tv_sec * tccSecondsToMillieSeconds) + (ts.tv_nsec / tccMillieSecondsToNanoSeconds); - -#elif HAVE_MACH_ABSOLUTE_TIME - /* use denom == 0 to indicate that s_TimebaseInfo is uninitialised. */ - if (s_TimebaseInfo.denom == 0) { - g_error ("s_TimebaseInfo is uninitialized."); - goto exit; - } - retval = (mach_absolute_time () * s_TimebaseInfo.numer / s_TimebaseInfo.denom) / tccMillieSecondsToNanoSeconds; - -#elif HAVE_GETHRTIME - retval = (gint64)(gethrtime () / tccMillieSecondsToNanoSeconds); - -#elif HAVE_READ_REAL_TIME - timebasestruct_t tb; - read_real_time (&tb, TIMEBASE_SZ); - if (time_base_to_time (&tb, TIMEBASE_SZ) != 0) { - g_error ("time_base_to_time() failed; errno is %d (%s)", errno, strerror (errno)); - goto exit; - } - retval = (tb.tb_high * tccSecondsToMillieSeconds) + (tb.tb_low / tccMillieSecondsToNanoSeconds); - -#else - struct timeval tv; - if (gettimeofday (&tv, NULL) == -1) { - g_error ("gettimeofday() failed; errno is %d (%s)", errno, strerror (errno)); - goto exit; - } - retval = (tv.tv_sec * tccSecondsToMillieSeconds) + (tv.tv_usec / tccMillieSecondsToMicroSeconds); - -#endif /* HAVE_CLOCK_MONOTONIC */ -exit: - return retval; + static gint64 boot_time = 0; + gint64 now; + if (!boot_time) + boot_time = get_boot_time (); + now = mono_100ns_datetime (); + /*printf ("now: %llu (boot: %llu) ticks: %llu\n", (gint64)now, (gint64)boot_time, (gint64)(now - boot_time));*/ + return (now - boot_time)/10000; } /* Returns the number of 100ns ticks from unspecified time: this should be monotonic */ diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 0971ee244a..5d8b0b758f 100644 Binary files a/po/mcs/de.gmo and b/po/mcs/de.gmo differ diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index 242d2d9d5d..5443fd8336 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -6cf6f2210ec4a21fd2ee54151620ab5755280e16 \ No newline at end of file +8e7491b65992cbfc838b99016086596f2525e087 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 8cb3dd4661..72413131b4 100644 Binary files a/po/mcs/es.gmo and b/po/mcs/es.gmo differ diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 99503ef7ec..3e31a16275 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -bdc5472e5725fbd40711d72a9b664e5511b4c9d4 \ No newline at end of file +21324a200c24c7bb0a359b587188fdd41862c93d \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 74ec003512..1864f7bebd 100644 Binary files a/po/mcs/ja.gmo and b/po/mcs/ja.gmo differ diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 9c1b90eb29..8dc086c924 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -3c687d35289e5d749f66884ff92d3f0ade36db0d \ No newline at end of file +7a339f2c16e1288f7b2b1da34fea9c2c657d9676 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index b5dce9210c..7f42cac2c7 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 5.10.1.2\n" +"Project-Id-Version: mono 5.10.1.4\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2018-03-20 08:32+0000\n" +"POT-Creation-Date: 2018-03-21 08:45+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index 8382a82c58..70cf2c177d 100644 Binary files a/po/mcs/pt_BR.gmo and b/po/mcs/pt_BR.gmo differ diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 5ded7651d0..c74ccd3289 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -130a38c1cd091db0a16920934c97c2bd25620cb7 \ No newline at end of file +00910a452b11f7bda00762ecf15da1aaacd3631b \ No newline at end of file