arthur.barton.de Git - ngircd-alex.git/commit

]> arthur.barton.de Git - ngircd-alex.git/commit

author	Alexander Barton <alex@barton.de>
	Sat, 6 Oct 2012 16:25:43 +0000 (18:25 +0200)
committer	Alexander Barton <alex@barton.de>
	Sat, 6 Oct 2012 16:26:25 +0000 (18:26 +0200)
commit	46b0eef721b9b3eec37d29aff65b6a7fc488a887
tree	d863ced9e38b1e6e38c8fef3afa984d69984ab45	tree \| snapshot
parent	4790d78c980c79abfd71c064be1eb085717210f8	commit \| diff
parent	343a90dc376eb9979151752ec33c64ca45b04802	commit \| diff

Merge branch 'bug109-CHARCONV'

This closes bug #109.

* bug109-CHARCONV:
  Debian: require "telnet" or "telnet-ssl" for building
  Debian ngircd-full[-dbg]: enable CHARCONV
  Add "CHARCONV" to "feature string" when enabled
  Implement new IRC+ "CHARCONV" command
  Added new configure option "--with-iconv"

Conflicts:
src/ngircd/messages.h

configure.ng	diff1 \|	\|	blob \| history
contrib/MacOSX/config.h	diff1 \|	diff2 \|	blob \| history
src/ngircd/Makefile.ng	diff1 \|	\|	blob \| history
src/ngircd/messages.h	diff1 \|	diff2 \|	blob \| history
src/ngircd/ngircd.c	diff1 \|	diff2 \|	blob \| history

Alex' ngIRCd development repository

RSS Atom

configure.ng	diff1 \|	\|	blob \| history
contrib/MacOSX/config.h	diff1 \|	diff2 \|	blob \| history
src/ngircd/Makefile.ng	diff1 \|	\|	blob \| history
src/ngircd/messages.h	diff1 \|	diff2 \|	blob \| history
src/ngircd/ngircd.c	diff1 \|	diff2 \|	blob \| history