branch | s11-update |
changeset 4237 | 3517b6c3873e |
parent 227 | 1e1ccdc6b1e6 |
child 3957 | a5f5c603e464 |
child 7869 | a80ad5071d35 |
--- a/components/meld/patches/meld.patch Fri Apr 17 01:53:46 2015 -0700 +++ b/components/meld/patches/meld.patch Thu Mar 05 15:29:46 2015 -0800 @@ -1,8 +1,10 @@ +This patch originated in-house but is not suitable for upstream. + --- meld-1.4.0/bin/meld Sun Sep 26 15:25:02 2010 +++ meld-1.4.0/bin/new.meld Mon May 2 12:00:56 2011 @@ -1,4 +1,4 @@ -#! /usr/bin/env python -+#!/usr/bin/python2.6 ++#!/usr/bin/python2.7 ### Copyright (C) 2002-2006 Stephen Kennedy <[email protected]>