summaryrefslogtreecommitdiffstats
path: root/bin/pkgmerge.new
diff options
context:
space:
mode:
authorBrian Harring <ferringb@gentoo.org>2005-08-30 05:16:47 +0000
committerBrian Harring <ferringb@gentoo.org>2005-08-30 05:16:47 +0000
commit1df71a7fa071e0fac40b305dcc36912df166c073 (patch)
tree653b875f7dff51118756f2f564b37e2283b68db4 /bin/pkgmerge.new
parenta4d23cb368ec1c4478b882e9e45ee1ce46408c92 (diff)
downloadportage-1df71a7fa071e0fac40b305dcc36912df166c073.tar.gz
portage-1df71a7fa071e0fac40b305dcc36912df166c073.tar.bz2
portage-1df71a7fa071e0fac40b305dcc36912df166c073.zip
header changes, $Header: -> $Id:
svn path=/main/branches/2.0/; revision=1951
Diffstat (limited to 'bin/pkgmerge.new')
-rwxr-xr-xbin/pkgmerge.new2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/pkgmerge.new b/bin/pkgmerge.new
index 66dbe1676..3abcb88c8 100755
--- a/bin/pkgmerge.new
+++ b/bin/pkgmerge.new
@@ -1,7 +1,7 @@
#!/usr/bin/python
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/pkgmerge.new,v 1.7 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/pkgmerge.new,v 1.7 2004/10/04 13:56:50 vapier Exp $
import os,string,sys
sys.path = ["/usr/lib/portage/pym"]+sys.path