Merge branch 'upstream'
Former-commit-id: 56bc963aee9747656d1589096525c2113ebe2f8a
This commit is contained in:
commit
a4a01700a1
@ -1 +1 @@
|
||||
cbbc8cbbdd0d8f33f327e39d59e267d63ec43436
|
||||
de3e24c05b4a999f066e347afb03569254b27184
|
@ -1 +1 @@
|
||||
18c90a85a208f0899ccd35e437481a76934ca350
|
||||
00398559330cf6eba61d24e026aceb55046393df
|
@ -41,7 +41,7 @@ static partial class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "6.8.0.95";
|
||||
public const string MonoVersion = "6.8.0.96";
|
||||
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 @@
|
||||
b18e8f8fc808314f0bd5d9db4efbe8b9ac4d21a0
|
||||
4542cfb9c7aa4c1597bbe8196095cc82987acb37
|
@ -1 +1 @@
|
||||
f6f8d0b05ebac65dbd253511d88708db62560880
|
||||
da0009f4f4683e6a844a961675727bc1d588d8e7
|
@ -1 +1 @@
|
||||
334a143b5e7ccd8e120b3ceeb20460aba527bd92
|
||||
60c4297f86b8bbaf88f05ce0f5f9187a1a0fb110
|
@ -1 +1 @@
|
||||
c46287bc4da9298130e80bec9c7ea258fb0ae0e9
|
||||
6326316802802f69b378f2e8d4143f4e31661f8d
|
@ -1 +1 @@
|
||||
5fc58a69d67cfd5f621cdf71146508cd165cd069
|
||||
8661e2f4ee10982f2e6156d41460ab94127e54a6
|
@ -1 +1 @@
|
||||
72da64886b1e1b7be52cfce60e1d5d76c9302efe
|
||||
8042cadf0fb06dce7232e20226536fe1ed05905b
|
@ -1 +1 @@
|
||||
51c742b93e604e3680f39bb5f52a43e3dde60565
|
||||
1216afb95b0eecf5f9ae83b3e13de752b258fc0b
|
@ -1 +1 @@
|
||||
e37511b1871a2ff62b8a917600e19c71a9ba0457
|
||||
453ee7ac8fb766c5acfb7c4fcf142887f2e933c6
|
@ -1 +1 @@
|
||||
b18e8f8fc808314f0bd5d9db4efbe8b9ac4d21a0
|
||||
4542cfb9c7aa4c1597bbe8196095cc82987acb37
|
@ -1 +1 @@
|
||||
f6f8d0b05ebac65dbd253511d88708db62560880
|
||||
da0009f4f4683e6a844a961675727bc1d588d8e7
|
@ -1 +1 @@
|
||||
334a143b5e7ccd8e120b3ceeb20460aba527bd92
|
||||
60c4297f86b8bbaf88f05ce0f5f9187a1a0fb110
|
@ -1 +1 @@
|
||||
c46287bc4da9298130e80bec9c7ea258fb0ae0e9
|
||||
6326316802802f69b378f2e8d4143f4e31661f8d
|
@ -1 +1 @@
|
||||
5fc58a69d67cfd5f621cdf71146508cd165cd069
|
||||
8661e2f4ee10982f2e6156d41460ab94127e54a6
|
@ -1 +1 @@
|
||||
72da64886b1e1b7be52cfce60e1d5d76c9302efe
|
||||
8042cadf0fb06dce7232e20226536fe1ed05905b
|
@ -1 +1 @@
|
||||
51c742b93e604e3680f39bb5f52a43e3dde60565
|
||||
1216afb95b0eecf5f9ae83b3e13de752b258fc0b
|
@ -1 +1 @@
|
||||
e37511b1871a2ff62b8a917600e19c71a9ba0457
|
||||
453ee7ac8fb766c5acfb7c4fcf142887f2e933c6
|
@ -1 +1 @@
|
||||
b18e8f8fc808314f0bd5d9db4efbe8b9ac4d21a0
|
||||
4542cfb9c7aa4c1597bbe8196095cc82987acb37
|
@ -1 +1 @@
|
||||
f6f8d0b05ebac65dbd253511d88708db62560880
|
||||
da0009f4f4683e6a844a961675727bc1d588d8e7
|
@ -1 +1 @@
|
||||
334a143b5e7ccd8e120b3ceeb20460aba527bd92
|
||||
60c4297f86b8bbaf88f05ce0f5f9187a1a0fb110
|
@ -1 +1 @@
|
||||
c46287bc4da9298130e80bec9c7ea258fb0ae0e9
|
||||
6326316802802f69b378f2e8d4143f4e31661f8d
|
@ -1 +1 @@
|
||||
5fc58a69d67cfd5f621cdf71146508cd165cd069
|
||||
8661e2f4ee10982f2e6156d41460ab94127e54a6
|
@ -1 +1 @@
|
||||
72da64886b1e1b7be52cfce60e1d5d76c9302efe
|
||||
8042cadf0fb06dce7232e20226536fe1ed05905b
|
@ -1 +1 @@
|
||||
51c742b93e604e3680f39bb5f52a43e3dde60565
|
||||
1216afb95b0eecf5f9ae83b3e13de752b258fc0b
|
@ -1 +1 @@
|
||||
e37511b1871a2ff62b8a917600e19c71a9ba0457
|
||||
453ee7ac8fb766c5acfb7c4fcf142887f2e933c6
|
@ -1 +1 @@
|
||||
b18e8f8fc808314f0bd5d9db4efbe8b9ac4d21a0
|
||||
4542cfb9c7aa4c1597bbe8196095cc82987acb37
|
@ -1 +1 @@
|
||||
f6f8d0b05ebac65dbd253511d88708db62560880
|
||||
da0009f4f4683e6a844a961675727bc1d588d8e7
|
@ -1 +1 @@
|
||||
80471a449b7f3854c546f0ab0654a4bf914650e1
|
||||
4752b9058364d154d98971bb24834b3cb112b1a0
|
@ -1 +1 @@
|
||||
c46287bc4da9298130e80bec9c7ea258fb0ae0e9
|
||||
6326316802802f69b378f2e8d4143f4e31661f8d
|
@ -1 +1 @@
|
||||
5fc58a69d67cfd5f621cdf71146508cd165cd069
|
||||
8661e2f4ee10982f2e6156d41460ab94127e54a6
|
@ -1 +1 @@
|
||||
72da64886b1e1b7be52cfce60e1d5d76c9302efe
|
||||
8042cadf0fb06dce7232e20226536fe1ed05905b
|
@ -1 +1 @@
|
||||
51c742b93e604e3680f39bb5f52a43e3dde60565
|
||||
1216afb95b0eecf5f9ae83b3e13de752b258fc0b
|
@ -1 +1 @@
|
||||
880ec3d143f504e5ae7d0397527a8d4abac5f233
|
||||
c0967bfded327c9d50650e0fc75d7694bad1752c
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/41f9a07"
|
||||
#define FULL_VERSION "explicit/a3c4b14"
|
||||
|
@ -1598,10 +1598,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 @@
|
||||
3fb6b9214b096e5b07be09875c393ee6df3fab92
|
||||
bb538a99b5efd047ef02b17e31f1d8edbbdee78b
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
9a3d6c33ac46d73883689eaa0ce75afb6f928a79
|
||||
aeaa4159003d64166ab5c991d33e30321d552597
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
4550de30fb7019ffa81380e3a945961b2d45d666
|
||||
eec1843d1da1bfc45a358ae5fa6a7da062f9fa5a
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 6.8.0.95\n"
|
||||
"Project-Id-Version: mono 6.8.0.96\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2020-01-11 08:08+0000\n"
|
||||
"POT-Creation-Date: 2020-01-13 08:14+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 @@
|
||||
fd4299fcb626807842bb29a4e8b3f194ef954e18
|
||||
1a493e9bc10df7ff0587c803ad230388a76128a4
|
Loading…
x
Reference in New Issue
Block a user