]> mj.ucw.cz Git - pciids.git/commitdiff
projects / pciids.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf07fb1 051e55b)
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)
Conflicts:

index.html
static/common.css

1  2 
static/screen.css patch | diff1 | diff2 | blob | history

diff --cc static/screen.css
Simple merge
Unnamed repository; edit this file to name it for gitweb.