projects / NextIRCd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb375eb 2487ad2)
Merge remote-tracking branch 'remotes/IOMultiplexer/v2'
authorpk910 <philipp@zoelle1.de>
Tue, 15 Jul 2014 14:55:12 +0000 (16:55 +0200)
committerpk910 <philipp@zoelle1.de>
Tue, 15 Jul 2014 14:55:12 +0000 (16:55 +0200)
Conflicts:
.gitignore


Trivial merge
NextIRC experimental IRC Daemon