]> git.netwichtig.de Git - user/henk/code/inspircd.git/commitdiff
projects / user / henk / code / inspircd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d25ad2 7010a92)
Merge branch 'master+flatmap'
authorAttila Molnar <attilamolnar@hush.com>
Fri, 19 Dec 2014 14:24:02 +0000 (15:24 +0100)
committerAttila Molnar <attilamolnar@hush.com>
Fri, 19 Dec 2014 14:24:02 +0000 (15:24 +0100)
1  2 
include/configreader.h patch | diff1 | diff2 | blob | history

diff --cc include/configreader.h
Simple merge