projects
/
NextIRCd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
981be1f
0f7daad
)
Merge remote-tracking branch 'remotes/IOMultiplexer/v2'
author
pk910
<philipp@zoelle1.de>
Wed, 28 Jan 2015 01:20:45 +0000
(
02:20
+0100)
committer
pk910
<philipp@zoelle1.de>
Wed, 28 Jan 2015 01:20:45 +0000
(
02:20
+0100)
Conflicts:
configure.ac
1
2
configure.ac
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
configure.ac
Simple merge