| author | pnyc <petr.nyc@oracle.com> |
| Thu, 31 Mar 2016 03:53:15 -0700 | |
| branch | s11u3-sru |
| changeset 5689 | f1e1312aaa54 |
| parent 4237 | 3517b6c3873e |
| child 3957 | a5f5c603e464 |
| child 7869 | a80ad5071d35 |
| permissions | -rw-r--r-- |
|
4237
3517b6c3873e
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. |
|
3517b6c3873e
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 |
|
4237
3517b6c3873e
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 |