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

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

Needed to keep the line commented

Conflicts:

	scripts/pciids-export
---

d0676dde535505cc68e9387a28460266bd396501
diff --cc scripts/pciids-export
index b3748d0,001e599..b8ac82b
--- a/scripts/pciids-export
+++ b/scripts/pciids-export
@@@ -26,9 -26,9 +26,9 @@@ cd per
  cat cf/class_head.ids >> ../pci.ids.new
  ./scripts/export.pl PD >> ../pci.ids.new
  cd ..
- if ! [ -f docs/pci.ids ] || ! cmp static/pci.ids pci.ids.new >/dev/null ; then
- #	ln pci.ids.new ~/origs/00-current
- 	ln pci.ids.new docs/pci.ids
+ if ! [ -f docs/pci.ids ] || ! cmp docs/pci.ids pci.ids.new >/dev/null ; then
 -	ln -f pci.ids.new ~/origs/00-current
++#	ln -f pci.ids.new ~/origs/00-current
+ 	ln -f pci.ids.new docs/pci.ids
  	bzip2 -9c <docs/pci.ids >docs/pci.ids.bz2
  	gzip -9c <docs/pci.ids >docs/pci.ids.gz
  fi