Mercurial Mercurial > upstream > oracle > userland-gate / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/meld/patches/INSTALL.patch
changeset 3914 0919f4d30271
parent 227 1e1ccdc6b1e6
child 3957 a5f5c603e464
child 7869 a80ad5071d35 
--- a/components/meld/patches/INSTALL.patch	Thu Mar 05 14:44:01 2015 -0800
+++ b/components/meld/patches/INSTALL.patch	Thu Mar 05 15:29:46 2015 -0800
@@ -1,10 +1,14 @@
---- meld-1.4.0/INSTALL	Sun Sep 26 15:25:02 2010
-+++ meld-1.4.0/new.INSTALL	Mon Apr 25 11:11:12 2011
-@@ -18,7 +18,7 @@
+This patch originated in-house but is not suitable for upstream.
+
+--- meld-1.4.0/INSTALL.~1~	2010-09-26 15:25:02.000000000 -0700
++++ meld-1.4.0/INSTALL	2015-03-05 15:13:15.766057260 -0800
+@@ -17,8 +17,8 @@
+ ##   Now run "/usr/local/bin/meld"
  ## 
  ##   You can customise the install paths used here:
- PYTHON ?= python
+-PYTHON ?= python
 -prefix := /usr/local
++PYTHON ?= python2.7
 +prefix := /usr
  bindir := $(prefix)/bin
  libdir := $(prefix)/lib
upstream/oracle/userland-gate