Merge branch 'bug152-AllowedChannelTypes'
authorAlexander Barton <alex@barton.de>
Sun, 4 Aug 2013 12:11:12 +0000 (14:11 +0200)
committerAlexander Barton <alex@barton.de>
Sun, 4 Aug 2013 12:11:12 +0000 (14:11 +0200)
commit139f5961a078dfd23a469d98c3942f42595854aa
tree8f12833feadf5fe195200b94b47280134a253b85
parent15dfdaac823c5927b096b2980753a6198a6a7741
parent5258fb7f7c3d92a35083f869bae4f05ab988d2da
Merge branch 'bug152-AllowedChannelTypes'

* bug152-AllowedChannelTypes:
  Implement new configuration option "AllowedChannelTypes"
  Introduce "CHANTYPES" #define
src/ngircd/conf.c
src/ngircd/irc-channel.c
src/ngircd/irc-info.c