Upstream sync

yousseb · May 4, 2016 · 457c875 · 457c875
1 parent 417a58f
commit 457c875
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/osx/Meld b/osx/Meld
@@ -29,10 +29,10 @@ MELDPATH = os.path.join(getScriptPath(), "Meld-bin")
 APPPATH = fix_abspath(os.path.join(getScriptPath(), '..'))
 
 LANG="C"
-try:
-    LANG= ".".join(locale.getdefaultlocale()[0], "UTF-8")
-except:
-    pass
+#try:
+#    LANG= ".".join(locale.getdefaultlocale()[0], "UTF-8")
+#except:
+#    pass
 
 environment = dict(os.environ, **{
     "DYLD_LIBRARY_PATH": ":".join([

diff --git a/osx/conf.py b/osx/conf.py
@@ -3,7 +3,7 @@
 import sys
 
 __package__ = "meld"
-__version__ = "3.15.4"
+__version__ = "3.16.0"
 
 # START; these paths are clobbered on install by meld.build_helpers
 DATADIR = os.path.join(sys.prefix, "share", "meld")