author | John Beck <John.Beck@Oracle.COM> |
Thu, 05 Mar 2015 15:29:46 -0800 | |
changeset 3914 | 0919f4d30271 |
parent 227 | 1e1ccdc6b1e6 |
child 3957 | a5f5c603e464 |
child 7869 | a80ad5071d35 |
permissions | -rw-r--r-- |
3914
0919f4d30271
20657358 migrate meld from Python 2.6 to 2.7
John Beck <John.Beck@Oracle.COM>
parents:
227
diff
changeset
|
1 |
This patch originated in-house but is not suitable for upstream. |
0919f4d30271
20657358 migrate meld from Python 2.6 to 2.7
John Beck <John.Beck@Oracle.COM>
parents:
227
diff
changeset
|
2 |
|
227
1e1ccdc6b1e6
7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff
changeset
|
3 |
--- meld-1.4.0/bin/meld Sun Sep 26 15:25:02 2010 |
1e1ccdc6b1e6
7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff
changeset
|
4 |
+++ meld-1.4.0/bin/new.meld Mon May 2 12:00:56 2011 |
1e1ccdc6b1e6
7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff
changeset
|
5 |
@@ -1,4 +1,4 @@ |
1e1ccdc6b1e6
7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff
changeset
|
6 |
-#! /usr/bin/env python |
3914
0919f4d30271
20657358 migrate meld from Python 2.6 to 2.7
John Beck <John.Beck@Oracle.COM>
parents:
227
diff
changeset
|
7 |
+#!/usr/bin/python2.7 |
227
1e1ccdc6b1e6
7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff
changeset
|
8 |
|
1e1ccdc6b1e6
7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff
changeset
|
9 |
### Copyright (C) 2002-2006 Stephen Kennedy <[email protected]> |
1e1ccdc6b1e6
7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff
changeset
|
10 |