]> jfr.im git - irc/quakenet/newserv.git/commitdiff
projects / irc / quakenet / newserv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6331db2 03d0dab)
Merge default.
authorGunnar Beutner <redacted>
Fri, 26 Jul 2013 21:17:34 +0000 (23:17 +0200)
committerGunnar Beutner <redacted>
Fri, 26 Jul 2013 21:17:34 +0000 (23:17 +0200)
--HG--
branch : shroudsstring

1  2 
core/main.c patch | diff1 | diff2 | blob | history

diff --cc core/main.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.