]> mj.ucw.cz Git - pciids.git/commit
Merge branch 'master' of /home/vorner/pciids
authorThe PCI ID Mail Robot <pciids@ucw.cz>
Sat, 4 Oct 2008 22:15:45 +0000 (00:15 +0200)
committerThe PCI ID Mail Robot <pciids@ucw.cz>
Sat, 4 Oct 2008 22:15:45 +0000 (00:15 +0200)
commit3f07a9b2db92ac05004cfad21b250f24a5940656
treeb1a48be9cb1e9efb0e0e4d9838a03473bbc9b43c
parentcf07fb13368d87d0bfb582bdc613c1546d55cbb5
parent051e55b65141e1f8cbcbf7578b36de1112c1760b
Merge branch 'master' of /home/vorner/pciids

Conflicts:

index.html
static/common.css
static/screen.css