]> 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: 38b2299 1b957ed)
Merge branch 'master+exttype' into master+no-rtti
authorAttila Molnar <attilamolnar@hush.com>
Thu, 22 Jan 2015 11:14:25 +0000 (12:14 +0100)
committerAttila Molnar <attilamolnar@hush.com>
Thu, 22 Jan 2015 11:14:25 +0000 (12:14 +0100)
1  2 
src/base.cpp patch | diff1 | diff2 | blob | history

diff --cc src/base.cpp
Simple merge