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: 4a2200c9f49a587ad9c0ec20c7c81ec791171ea0
This commit is contained in:
Xamarin Public Jenkins 2016-04-28 10:34:45 -04:00
commit c6524edfcd
14 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mono/metadata/method-builder.c
View File

@ -183,9 +183,11 @@ mono_mb_create_method (MonoMethodBuilder *mb, MonoMethodSignature *signature, in
#endif #endif
} }
#ifndef DISABLE_JIT
/* Free the locals list so mono_mb_free () doesn't free the types twice */ /* Free the locals list so mono_mb_free () doesn't free the types twice */
g_list_free (mb->locals_list); g_list_free (mb->locals_list);
mb->locals_list = NULL; mb->locals_list = NULL;
#endif
method->signature = signature; method->signature = signature;
if (!signature->hasthis) if (!signature->hasthis)

2
mono/mini/Makefile.am
View File

@ -801,7 +801,7 @@ EXTRA_DIST = TestDriver.cs \
Makefile.am.in Makefile.am.in
version.h: Makefile version.h: Makefile
echo "#define FULL_VERSION \"Stable 4.4.0.142/81f38a9\"" > version.h echo "#define FULL_VERSION \"Stable 4.4.0.148/fcf7a6d\"" > 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

@ -801,7 +801,7 @@ EXTRA_DIST = TestDriver.cs \
Makefile.am.in Makefile.am.in
version.h: Makefile version.h: Makefile
echo "#define FULL_VERSION \"Stable 4.4.0.142/81f38a9\"" > version.h echo "#define FULL_VERSION \"Stable 4.4.0.148/fcf7a6d\"" > 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 @@
fe183791db460a9dd05074980db60cfb70ea20c4 626933e5ad9d50d227ef41d3c68cad86d47c96b1

2
mono/mini/version.h
View File

@ -1 +1 @@
#define FULL_VERSION "Stable 4.4.0.142/81f38a9" #define FULL_VERSION "Stable 4.4.0.148/fcf7a6d"

BIN
po/mcs/de.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
4afeb56d03f2ff0ee686d07c1095753b1b597b6a 88d6f9acb73cde68c6288499f065261a599b270f

BIN
po/mcs/es.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
3e9cb2919279391d05fc709a3a605e5b3345c4cd 0a9e8d8aff24083e02f515319623a6392f8eb70b

BIN
po/mcs/ja.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
e805c0c6637c940bbad481235085f5803f523af3 c832a0e75db83f23638f33b3b0c2a40fe7f321e2

2
po/mcs/mcs.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mono 4.4.0\n" "Project-Id-Version: mono 4.4.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-04-28 08:23-0400\n" "POT-Creation-Date: 2016-04-28 10:14-0400\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 @@
b570606f4dc4d196eaca6f4988a275ebafa669fe f6bd3540e207ff379da60f4f86acb7b2ad430bbb