projects / web/konrad/smoke.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 554209c 4c6eca6)
merge barcode plugin and seating branches
authorKonrad Rosenbaum <konrad@silmor.de>
Mon, 20 Jan 2014 07:53:24 +0000 (08:53 +0100)
committerKonrad Rosenbaum <konrad@silmor.de>
Mon, 20 Jan 2014 07:53:24 +0000 (08:53 +0100)
1  2 
wob/magicsmoke.wolf patch | diff1 | diff2 | blob | history

diff --cc wob/magicsmoke.wolf
Simple merge
Unnamed repository; edit this file 'description' to name the repository.