components/meld/patches/meld.patch
author lijo george - Sun Microsystems - Bangalore India <lijo.x.george@oracle.com>
Tue, 12 Jun 2012 00:53:41 -0700
branchs11-sru
changeset 2289 d47b778ad3d1
parent 227 1e1ccdc6b1e6
child 3914 0919f4d30271
permissions -rw-r--r--
7119673 can't get "IF-MIB::ifPhysAddress" value on solaris11 7127371 net-snmp cannot cope with net0 style interface names resulting in ifType of zero
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