projects
/
NextIRCd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fc3df37
d7b26aa
)
Merge remote-tracking branch 'remotes/IOMultiplexer/v2'
author
pk910
<philipp@zoelle1.de>
Sun, 20 Jul 2014 22:06:08 +0000
(
00:06
+0200)
committer
pk910
<philipp@zoelle1.de>
Sun, 20 Jul 2014 22:06:08 +0000
(
00:06
+0200)
Conflicts:
src/IOHandler/IOSockets.c
Trivial merge