]> mj.ucw.cz Git - pciids.git/commit
Merge branch 'master' of /home/vorner/pciids
authorThe PCI ID Mail Robot <pciids@ucw.cz>
Fri, 3 Oct 2008 17:54:43 +0000 (19:54 +0200)
committerThe PCI ID Mail Robot <pciids@ucw.cz>
Fri, 3 Oct 2008 17:54:43 +0000 (19:54 +0200)
commit6bee93a95d2c5feac17dd687f1bab5f653bff280
tree672dd8558e52163e37a60e979eebae5a54d8600c
parent36cde386a849e57ff5895e132f35406178522932
parente61b3557eb4ee034b2b89f505ea30aa7b4cf73eb
Merge branch 'master' of /home/vorner/pciids

Conflicts:

scripts/pciids-export
scripts/pciids-export