| author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
| Fri, 11 Mar 2016 18:20:02 -0800 | |
| changeset 5597 | bcd66d6b1f98 |
| parent 3957 | a5f5c603e464 |
| 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 |
|
|
3957
a5f5c603e464
20704082 meld should be updated to version 1.8.6
Rich Burridge <rich.burridge@oracle.com>
parents:
3914
diff
changeset
|
3 |
--- meld-1.8.6/bin/meld.orig 2015-03-13 11:51:14.350881777 -0700 |
|
a5f5c603e464
20704082 meld should be updated to version 1.8.6
Rich Burridge <rich.burridge@oracle.com>
parents:
3914
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 |
|
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 |