]> git.netwichtig.de Git - user/henk/code/inspircd.git/commitdiff
Merge branch 'master+serviceinit'
authorAttila Molnar <attilamolnar@hush.com>
Wed, 2 Dec 2015 12:30:24 +0000 (13:30 +0100)
committerAttila Molnar <attilamolnar@hush.com>
Wed, 2 Dec 2015 12:30:24 +0000 (13:30 +0100)
1  2 
include/extensible.h
include/modules.h
src/base.cpp
src/modules.cpp

Simple merge
Simple merge
diff --cc src/base.cpp
Simple merge
diff --cc src/modules.cpp
Simple merge