diff options
author | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2014-05-29 22:06:37 +0400 |
---|---|---|
committer | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2014-05-29 22:06:37 +0400 |
commit | 0e6566160d614683124e6521f581b2aa85fb17b1 (patch) | |
tree | 341a632ef9cbacf43d4d99786a6c25a1a7493c09 /main/configure.in | |
parent | e2c0b3d7b180620b0da6c3b82b4c8aceb68a8000 (diff) | |
parent | b1d501371db3a5325d122150d0e546063aa44776 (diff) |
Merge remote-tracking branch 'mono/master' into nativeWindowsDialogs
Conflicts:
main/Main.sln
Diffstat (limited to 'main/configure.in')
-rw-r--r-- | main/configure.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/main/configure.in b/main/configure.in index 65c111d125..91dc196c5a 100644 --- a/main/configure.in +++ b/main/configure.in @@ -235,7 +235,7 @@ fi AM_CONDITIONAL(ENABLE_WINDOWSPLATFORM, [test x$enable_windowsplatform = xyes]) dnl Intl -ALL_LINGUAS="cs da de es fr ja pt_BR tr pl it zh_TW zh_CN ru sl ca gl pt sv nl id hu nb" +ALL_LINGUAS="cs da de es fr ja pt_BR tr pl it zh_TW zh_CN ru sl ca gl pt sv nl id hu nb ko" AC_SUBST(ALL_LINGUAS) GETTEXT_PACKAGE=monodevelop AC_SUBST(GETTEXT_PACKAGE) @@ -279,6 +279,7 @@ src/core/MonoDevelop.Core/Makefile src/core/MonoDevelop.Projects.Formats.MSBuild/Makefile src/core/MonoDevelop.Ide/Makefile src/core/MonoDevelop.Startup/Makefile +src/core/MonoDevelop.TextEditor.Tests/Makefile src/tools/Makefile src/tools/mdhost/Makefile src/tools/mdtool/Makefile @@ -347,6 +348,8 @@ src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/Mak tests/Makefile tests/UnitTests/Makefile tests/UserInterfaceTests/Makefile +tests/TestRunner/Makefile +tests/Ide.Tests/Makefile tests/MacPlatform.Tests/Makefile Makefile monodevelop |