Merge branch 'upstream'
Former-commit-id: 207b82196c97cabdf120115037feb1527cbb842c
This commit is contained in:
commit
2786500938
@ -1 +1 @@
|
||||
1ec1f13b23336e839dceed8ccd6731dd02720915
|
||||
5ea0274145c02531858c989f1ac0e5e14a153cf5
|
@ -1 +1 @@
|
||||
3d0bab926f5da4bfa2c3b38e7dad08f280c2228b
|
||||
60da131af7360f1dbc3a537f8ea11adc9cc7e997
|
@ -34,7 +34,7 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.10.0.116";
|
||||
public const string MonoVersion = "5.10.0.118";
|
||||
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 @@
|
||||
3528a4d084d9db2620ae927a78704f2fdc4dde09
|
||||
7805f334132a106e3aad5c3a8462675c3dab938c
|
@ -1 +1 @@
|
||||
d09b9a3a1574069b1e574798dbd6483681665184
|
||||
d5782dc53683b9e5d9732ba8ca5d0aad61f99cd6
|
@ -1 +1 @@
|
||||
598dca2f70bb95b4532acc6da208566dc4893deb
|
||||
e1b875997af0ecb18c2560f766beb60f49ed92a7
|
@ -1 +1 @@
|
||||
38f717388041bdb3e62229118e44818753615a33
|
||||
7b67956ad5fa1d7d2bf6519e6bda7f84755ee58b
|
@ -1 +1 @@
|
||||
126bb76fe92fca40a38be6608587a58a3257b9a6
|
||||
320e1131777f12fc0d331c1396e8303948bd1c8d
|
@ -1 +1 @@
|
||||
6862f39b66c913f59d89f0548ee8df36a44c18ec
|
||||
505e4d98d39c5b0f7484eaf5fbff2c75bc8d70a2
|
@ -1 +1 @@
|
||||
4d4451e4c348d6415ad163198098b22ccfc16145
|
||||
cc242a59836737c028571d639b1be8afe9fb8799
|
@ -1 +1 @@
|
||||
3528a4d084d9db2620ae927a78704f2fdc4dde09
|
||||
7805f334132a106e3aad5c3a8462675c3dab938c
|
@ -1 +1 @@
|
||||
d09b9a3a1574069b1e574798dbd6483681665184
|
||||
d5782dc53683b9e5d9732ba8ca5d0aad61f99cd6
|
@ -1 +1 @@
|
||||
598dca2f70bb95b4532acc6da208566dc4893deb
|
||||
e1b875997af0ecb18c2560f766beb60f49ed92a7
|
@ -1 +1 @@
|
||||
38f717388041bdb3e62229118e44818753615a33
|
||||
7b67956ad5fa1d7d2bf6519e6bda7f84755ee58b
|
@ -1 +1 @@
|
||||
126bb76fe92fca40a38be6608587a58a3257b9a6
|
||||
320e1131777f12fc0d331c1396e8303948bd1c8d
|
@ -1 +1 @@
|
||||
6862f39b66c913f59d89f0548ee8df36a44c18ec
|
||||
505e4d98d39c5b0f7484eaf5fbff2c75bc8d70a2
|
@ -1 +1 @@
|
||||
4d4451e4c348d6415ad163198098b22ccfc16145
|
||||
cc242a59836737c028571d639b1be8afe9fb8799
|
@ -1 +1 @@
|
||||
3528a4d084d9db2620ae927a78704f2fdc4dde09
|
||||
7805f334132a106e3aad5c3a8462675c3dab938c
|
@ -1 +1 @@
|
||||
d09b9a3a1574069b1e574798dbd6483681665184
|
||||
d5782dc53683b9e5d9732ba8ca5d0aad61f99cd6
|
@ -1 +1 @@
|
||||
598dca2f70bb95b4532acc6da208566dc4893deb
|
||||
e1b875997af0ecb18c2560f766beb60f49ed92a7
|
@ -1 +1 @@
|
||||
38f717388041bdb3e62229118e44818753615a33
|
||||
7b67956ad5fa1d7d2bf6519e6bda7f84755ee58b
|
@ -1 +1 @@
|
||||
126bb76fe92fca40a38be6608587a58a3257b9a6
|
||||
320e1131777f12fc0d331c1396e8303948bd1c8d
|
@ -1 +1 @@
|
||||
6862f39b66c913f59d89f0548ee8df36a44c18ec
|
||||
505e4d98d39c5b0f7484eaf5fbff2c75bc8d70a2
|
@ -1 +1 @@
|
||||
4d4451e4c348d6415ad163198098b22ccfc16145
|
||||
cc242a59836737c028571d639b1be8afe9fb8799
|
@ -11,7 +11,7 @@
|
||||
#include "mini.h"
|
||||
|
||||
/* Version number of the AOT file format */
|
||||
#define MONO_AOT_FILE_VERSION 142
|
||||
#define MONO_AOT_FILE_VERSION 143
|
||||
|
||||
#define MONO_AOT_TRAMP_PAGE_SIZE 16384
|
||||
|
||||
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/d0c1e9d"
|
||||
#define FULL_VERSION "explicit/b232a39"
|
||||
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
7fe0de82571e3ea6b5eb5de9efe456e4faf046ff
|
||||
a58eb5da43f30e62e3cd09eefedafdcdc9ed1f38
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
525bf967e5dc6faa384793e8c393748f83c5373c
|
||||
10d948b25ce09fbde9c105cf58df188ac4ece281
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
9e1e3e4be04e8d7f74afa714010451fbef7f1b5f
|
||||
8e3bc694a856de2b043760c4798b1638b5d58524
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 5.10.0.116\n"
|
||||
"Project-Id-Version: mono 5.10.0.118\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2018-02-15 18:49+0000\n"
|
||||
"POT-Creation-Date: 2018-02-16 18:52+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 @@
|
||||
46fc12c742c4131938bca1dd0d795d745e85891a
|
||||
abfedf0ac19cdc117054b74de10243a1f56df24f
|
Loading…
x
Reference in New Issue
Block a user