Merge branch 'bug153-ServerMask' into master
authorAlexander Barton <alex@barton.de>
Fri, 15 Feb 2013 20:59:06 +0000 (21:59 +0100)
committerAlexander Barton <alex@barton.de>
Fri, 15 Feb 2013 20:59:06 +0000 (21:59 +0100)
* bug153-ServerMask:
  Update irc-info.c to use irc-macros.h
  Add new irc-macros.h to project
  irc-info.c: add/streamline function documentation comments
  irc-info: move static functions at the top of the file
  Implement new function Client_SearchServer()

Conflicts:
src/ngircd/irc-info.c

1  2 
src/ngircd/irc-info.c

Simple merge