projects / web/konrad/smoke.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 092d3e1 86b2d34)
Merge branch 'master' of git://silmor.de/konrad/smoke
authorKonrad Rosenbaum <konrad@silmor.de>
Sat, 21 Nov 2015 12:06:29 +0000 (13:06 +0100)
committerKonrad Rosenbaum <konrad@silmor.de>
Sat, 21 Nov 2015 12:06:29 +0000 (13:06 +0100)
1  2 
magicsmoke.aurora patch | diff1 | diff2 | blob | history

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