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
tree1c1a9c7421b899a11a059b72615a7020b06ed7c2
parentf38a9035e5439cb395b2de6b9bdfa36102bfe80c
parent097c72aa65d9914d688eaece718648ca060e287a
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
src/ngircd/channel.c
src/ngircd/defines.h
src/ngircd/irc-info.c
src/ngircd/irc-mode.c
src/ngircd/irc-server.c
src/ngircd/messages.h