mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upstream'

Browse Source 
Former-commit-id: ac025c8e5d76d4ab640053fa1922142d6eb54d4f
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2016-12-05 19:49:29 +00:00
commit 34c34d0ca2
17 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mcs/class/lib/monolite/basic.exe.REMOVED.git-id
View File

@ -1 +1 @@
9cb84f032c0698d23a029b0f4719f509ddf8080f b3f8f8c80a38ce31cc9e392a4bb960e58d84a21a

2
mcs/mcs/settings.cs
View File

@ -1195,7 +1195,7 @@ namespace Mono.CSharp {
} }
return ParseResult.Success; return ParseResult.Success;
case "runtimemetadataversion": case "/runtimemetadataversion":
if (value.Length == 0) { if (value.Length == 0) {
Error_RequiresArgument (option); Error_RequiresArgument (option);
return ParseResult.Error; return ParseResult.Error;

4
mono/metadata/loader.h
View File

@ -4,7 +4,6 @@
#include <mono/metadata/metadata.h> #include <mono/metadata/metadata.h>
#include <mono/metadata/image.h> #include <mono/metadata/image.h>
#include <mono/utils/mono-error.h> #include <mono/utils/mono-error.h>
#include <mono/utils/mono-dl.h>
MONO_BEGIN_DECLS MONO_BEGIN_DECLS
@ -64,9 +63,6 @@ mono_lookup_internal_call (MonoMethod *method);
void* void*
mono_lookup_internal_call_full (MonoMethod *method, mono_bool *uses_handles); mono_lookup_internal_call_full (MonoMethod *method, mono_bool *uses_handles);
void
mono_loader_register_module (const char *name, MonoDl *module);
MONO_API const char* MONO_API const char*
mono_lookup_icall_symbol (MonoMethod *m); mono_lookup_icall_symbol (MonoMethod *m);

3
mono/metadata/metadata-internals.h
View File

@ -910,5 +910,8 @@ mono_image_set_description (MonoImageSet *);
MonoImageSet * MonoImageSet *
mono_find_image_set_owner (void *ptr); mono_find_image_set_owner (void *ptr);
void
mono_loader_register_module (const char *name, MonoDl *module);
#endif /* __MONO_METADATA_INTERNALS_H__ */ #endif /* __MONO_METADATA_INTERNALS_H__ */

2
mono/mini/Makefile.am
View File

@ -860,7 +860,7 @@ EXTRA_DIST = TestDriver.cs \
Makefile.am.in Makefile.am.in
version.h: Makefile version.h: Makefile
echo "#define FULL_VERSION \"Stable 4.8.0.371/902b4a9\"" > version.h echo "#define FULL_VERSION \"Stable 4.8.0.374/5e1b0a0\"" > version.h
# Utility target for patching libtool to speed up linking # Utility target for patching libtool to speed up linking
patch-libtool: patch-libtool:

2
mono/mini/Makefile.am.in
View File

@ -860,7 +860,7 @@ EXTRA_DIST = TestDriver.cs \
Makefile.am.in Makefile.am.in
version.h: Makefile version.h: Makefile
echo "#define FULL_VERSION \"Stable 4.8.0.371/902b4a9\"" > version.h echo "#define FULL_VERSION \"Stable 4.8.0.374/5e1b0a0\"" > version.h
# Utility target for patching libtool to speed up linking # Utility target for patching libtool to speed up linking
patch-libtool: patch-libtool:

2
mono/mini/Makefile.in.REMOVED.git-id
View File

@ -1 +1 @@
eaecaed9eab43c2e6afd56e9f55f1f0926fb397a bd2dc970d2cd2bab2dd66387eacff13809c8b08a

2
mono/mini/version.h
View File

@ -1 +1 @@
#define FULL_VERSION "Stable 4.8.0.371/902b4a9" #define FULL_VERSION "Stable 4.8.0.374/5e1b0a0"

BIN
po/mcs/de.gmo
View File

Binary file not shown.

2
po/mcs/de.po.REMOVED.git-id
View File

@ -1 +1 @@
efa66576beb2b9d15f28279dcd30bd1fa26e3538 0cbead8f0573d2cead8a1bc577181d4ae9095e50

BIN
po/mcs/es.gmo
View File

Binary file not shown.

2
po/mcs/es.po.REMOVED.git-id
View File

@ -1 +1 @@
93c80f11598a27a6b6aea96fc2405b456bf2ccb1 d9e362d4bf3058a3c0ebf4b47a1838d3f82fe0da

BIN
po/mcs/ja.gmo
View File

Binary file not shown.

2
po/mcs/ja.po.REMOVED.git-id
View File

@ -1 +1 @@
2ba3b14f1ede70361c9f8a5155745e3f7574c78a 3eba478262d3247ca64c6221277a01ea605062c7

2
po/mcs/mcs.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mono 4.8.0\n" "Project-Id-Version: mono 4.8.0\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2016-11-28 19:40+0000\n" "POT-Creation-Date: 2016-12-05 19:24+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

BIN
po/mcs/pt_BR.gmo
View File

Binary file not shown.

2
po/mcs/pt_BR.po.REMOVED.git-id
View File

@ -1 +1 @@
a64e6f8b63e4cb5d27429c1732c5430a328b73d3 565333991ccab0166ccd8d9fc1b80f2f08d79e84