From: Alexander Barton <alex@barton.de>
Date: Sun, 23 Sep 2012 17:58:50 +0000 (+0200)
Subject: Merge branch 'bug92-xop'
X-Git-Tag: rel-20-rc1~76
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=e3e181f4b3eae0e552632bce19bdff990196938f;hp=-c

Merge branch 'bug92-xop'

By Alexander Barton (5) and Sebastian Köhler (2)

* bug92-xop:
  Fix NAMES/WHO response when client has multi-prefix
  Fix prefix of "halfop" when "multi-prefix" is active
  Clean up doc/.gitignore
  doc/Modes.txt: add version number to new channel modes
  Fix some "whitespace glitches"
  Tests and documentation for xop
  Implemented xop support

Conflicts (because of "multi-prefix fix"):
	src/ngircd/irc-info.c

This fixes bug #92 "ngircd does not support XOP usermodes".
---

e3e181f4b3eae0e552632bce19bdff990196938f