Mercurial Mercurial > upstream > oracle > userland-gate / annotate
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/meld.patch
author Petr Sumbera <petr.sumbera@oracle.com>
Tue, 01 Apr 2014 01:43:14 -0700
branchs11u1-sru
changeset 3035 8420a12f63ef
parent 227 1e1ccdc6b1e6
child 3914 0919f4d30271
permissions -rw-r--r--
18490686 Upgrade Wireshark to version 1.8.13 (for 11.1SRU) 18384235 problem in UTILITY/WIRESHARK
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
227
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     1
 
--- 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 
     2
 
+++ 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 
     3
 
@@ -1,4 +1,4 @@
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     4
 
-#! /usr/bin/env python
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     5
 
+#!/usr/bin/python2.6
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     6
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     7
 
 ### Copyright (C) 2002-2006 Stephen Kennedy <[email protected]>
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     8
upstream/oracle/userland-gate