Permalink
Browse files

Upstream sync

  • Loading branch information...
1 parent 417a58f commit 457c8753158b43f49bdf0a3bde87316508cafa69 @yousseb committed May 4, 2016
Showing with 5 additions and 5 deletions.
  1. +4 −4 osx/Meld
  2. +1 −1 osx/conf.py
View
@@ -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([
View
@@ -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")

0 comments on commit 457c875

Please sign in to comment.