| author | Jiri Sasek <Jiri.Sasek@Oracle.COM> |
| Wed, 15 Mar 2017 10:30:53 -0700 | |
| branch | s11u3-sru |
| changeset 7925 | 9029178fe4cd |
| parent 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 |
|
|
7869
a80ad5071d35
20704082 meld should be updated to version 1.8.6
Rich Burridge <rich.burridge@oracle.com>
parents:
4237
diff
changeset
|
3 |
--- meld-1.8.6/bin/meld.orig 2015-03-13 11:51:14.350881777 -0700 |
|
a80ad5071d35
20704082 meld should be updated to version 1.8.6
Rich Burridge <rich.burridge@oracle.com>
parents:
4237
diff
changeset
|
4 |
+++ meld-1.8.6/bin/meld 2015-03-13 11:51:32.147493127 -0700 |
|
227
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 |