about summary refs log tree commit diff
path: root/src/ipaddr
diff options
context:
space:
mode:
authorAlexander Barton <alex@barton.de>2012-09-11 12:30:19 +0200
committerAlexander Barton <alex@barton.de>2012-09-11 12:30:19 +0200
commitf37600ee01f6cfd86e8fa80f77ee26ebaf3012b2 (patch)
tree1c1a9c7421b899a11a059b72615a7020b06ed7c2 /src/ipaddr
parentf38a9035e5439cb395b2de6b9bdfa36102bfe80c (diff)
parent097c72aa65d9914d688eaece718648ca060e287a (diff)
downloadngircd-f37600ee01f6cfd86e8fa80f77ee26ebaf3012b2.tar.gz
ngircd-f37600ee01f6cfd86e8fa80f77ee26ebaf3012b2.zip
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
Diffstat (limited to 'src/ipaddr')
0 files changed, 0 insertions, 0 deletions