]> mj.ucw.cz Git - pciids.git/commitdiff
projects / pciids.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af241f0 c071194)
Merge branch 'master' of /home/vorner/pciids
authorThe PCI ID Mail Robot <pciids@ucw.cz>
Mon, 6 Oct 2008 16:29:14 +0000 (18:29 +0200)
committerThe PCI ID Mail Robot <pciids@ucw.cz>
Mon, 6 Oct 2008 16:29:14 +0000 (18:29 +0200)
Conflicts:

static/screen.css


Trivial merge
Unnamed repository; edit this file to name it for gitweb.