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)
* bug152-AllowedChannelTypes:
  Implement new configuration option "AllowedChannelTypes"
  Introduce "CHANTYPES" #define

1  2 
src/ngircd/conf.c
src/ngircd/irc-channel.c
src/ngircd/irc-info.c

Simple merge
Simple merge
Simple merge