From: The PCI ID Mail Robot <pciids@ucw.cz>
Date: Fri, 3 Oct 2008 18:00:10 +0000 (+0200)
Subject: Merge branch 'master' of /home/vorner/pciids
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=1a41066b9777a1fabd7547a6c8ccca2e4f68ac20;p=pciids.git

Merge branch 'master' of /home/vorner/pciids
---

1a41066b9777a1fabd7547a6c8ccca2e4f68ac20
diff --cc scripts/pciids-export
index a0f0d90,34c7641..1f99588
--- a/scripts/pciids-export
+++ b/scripts/pciids-export
@@@ -30,8 -30,9 +30,9 @@@ if ! [ -f docs/pci.ids.nohead ] || ! cm
  	echo '# Version: '`date +%Y%m%d` >> pci.ids.final
  	echo >> pci.ids.final
  	cat pci.ids.new >> pci.ids.final
 -	ln -f pci.ids.final ~/origs/00-current
 +#	ln -f pci.ids.final ~/origs/00-current
  	ln -f pci.ids.final docs/pci.ids
+ 	ln -f pci.ids docs/pci.ids.nohead
  	rm pci.ids.final
  	bzip2 -9c <docs/pci.ids >docs/pci.ids.bz2
  	gzip -9c <docs/pci.ids >docs/pci.ids.gz