projects
/
NextIRCd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
e17a8a5
)
Merge remote-tracking branch 'IOMultiplexer/v2'
author
pk910
<philipp@zoelle1.de>
Thu, 24 Jul 2014 08:48:08 +0000
(10:48 +0200)
committer
pk910
<philipp@zoelle1.de>
Thu, 24 Jul 2014 08:48:08 +0000
(10:48 +0200)
Conflicts:
src/IOHandler/IODNSLookup.c
src/IOHandler/IODNSLookup.h
No differences found