]> mj.ucw.cz Git - pciids.git/commit
projects / pciids.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 09fe1e5 37e7d2e)
Merge branch 'master' of /home/vorner/pciids
authorThe PCI ID Mail Robot <pciids@ucw.cz>
Mon, 8 Sep 2008 21:18:35 +0000 (23:18 +0200)
committerThe PCI ID Mail Robot <pciids@ucw.cz>
Mon, 8 Sep 2008 21:18:35 +0000 (23:18 +0200)
commitd0676dde535505cc68e9387a28460266bd396501
tree6b89b198670754b0ac19dcb8408b6ef1464edc52tree | snapshot
parent09fe1e552114a3aa42cbee297e3c4331ad2dc2c4commit | diff
parent37e7d2e4a91cd601a5f7efa2d9d0afa08b5fd9c2commit | diff
Merge branch 'master' of /home/vorner/pciids

Needed to keep the line commented

Conflicts:

scripts/pciids-export
scripts/pciids-export diff1 | diff2 | blob | history
Unnamed repository; edit this file to name it for gitweb.