]> arthur.barton.de Git - ngircd-alex.git/commit
projects / ngircd-alex.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f38a903 097c72a)
Merge branch 'xop' of https://github.com/kart0ffelsack/ngircd into bug92-xop
authorAlexander Barton <alex@barton.de>
Tue, 11 Sep 2012 10:30:19 +0000 (12:30 +0200)
committerAlexander Barton <alex@barton.de>
Tue, 11 Sep 2012 10:30:19 +0000 (12:30 +0200)
commitf37600ee01f6cfd86e8fa80f77ee26ebaf3012b2
tree1c1a9c7421b899a11a059b72615a7020b06ed7c2tree | snapshot
parentf38a9035e5439cb395b2de6b9bdfa36102bfe80ccommit | diff
parent097c72aa65d9914d688eaece718648ca060e287acommit | diff
Merge branch 'xop' of https://github.com/kart0ffelsack/ngircd into bug92-xop

* 'xop' of https://github.com/kart0ffelsack/ngircd:
  Tests and documentation for xop
  Implemented xop support

Conflicts (because of merge of the 'cmode-M' branch):
src/ngircd/channel.c
src/ngircd/defines.h
src/ngircd/messages.h
doc/Modes.txt diff1 | diff2 | blob | history
src/ngircd/channel.c diff1 | diff2 | blob | history
src/ngircd/defines.h diff1 | diff2 | blob | history
src/ngircd/irc-info.c diff1 | diff2 | blob | history
src/ngircd/irc-mode.c diff1 | diff2 | blob | history
src/ngircd/irc-server.c diff1 | diff2 | blob | history
src/ngircd/messages.h diff1 | diff2 | blob | history
Alex' ngIRCd development repository