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

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

8b5b96d52794469f91bc9903e3b661f92461c808
diff --cc scripts/pciids-export
index b459305,b129fff..43fb26a
--- a/scripts/pciids-export
+++ b/scripts/pciids-export
@@@ -27,11 -27,12 +27,12 @@@ cat cf/class_head.ids >> ../pci.ids.ne
  cd ..
  if ! [ -f docs/pci.ids.nohead ] || ! cmp docs/pci.ids.nohead pci.ids.new >/dev/null ; then
  	cp perl/cf/head.ids pci.ids.final
- 	echo '# Version: '`date +%Y%m%d` >> pci.ids.final
+ 	echo '# Generated at: '`date '+%F %T'` >> 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.final docs/v2.2/pci.ids
  	ln -f pci.ids.new docs/pci.ids.nohead
  	rm pci.ids.final
  	bzip2 -9c <docs/pci.ids >docs/pci.ids.bz2