← Back to branch summary

~registry/ngircd/testing

~registry/ngircd/testing

Viewing all changes in revision 2695.

Committer: DNS
Date: 2013-08-27 14:48:36 UTC
mfrom: (2671.5.8)
Revision ID: git-v1:bdb2850b399a7fac6a70fe24bd1f58dbd78cc307

Merge branch 'master' into testing

· Remove Conf_PreventLocalChans and Conf_PreventMLChans, obsolete now
· Remove RPL_HELP_MSG

Fixed conflicts with:
        doc/sample-ngircd.conf.tmpl
        man/ngircd.conf.5.tmpl
        src/ngircd/conf.c
        src/ngircd/irc-channel.c
        src/ngircd/irc-info.c
        src/ngircd/messages.h

files added:
src/portab/strndup.c

files removed:
src/ngircd/irc-info.c~

files modified:
.gitignore

.travis.yml

ChangeLog

NEWS

configure.ng

contrib/Debian/changelog

contrib/Debian/ngircd.default

contrib/Debian/ngircd.init

contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj

contrib/ngircd.spec

doc/Commands.txt

doc/Protocol.txt

doc/sample-ngircd.conf.tmpl

man/ngircd.8.tmpl

man/ngircd.conf.5.tmpl

src/ipaddr/ng_ipaddr.h

src/ngircd/channel.c

src/ngircd/channel.h

src/ngircd/client.c

src/ngircd/client.h

src/ngircd/conf-ssl.h

src/ngircd/conf.c

src/ngircd/conf.h

src/ngircd/conn-encoding.c

src/ngircd/conn-func.c

src/ngircd/conn-ssl.c

src/ngircd/conn-ssl.h

src/ngircd/conn.c

src/ngircd/conn.h

src/ngircd/defines.h

src/ngircd/irc-cap.c

src/ngircd/irc-channel.c

src/ngircd/irc-encoding.c

src/ngircd/irc-info.c

src/ngircd/irc-login.c

src/ngircd/irc-macros.h

src/ngircd/irc-metadata.c

src/ngircd/irc-mode.c

src/ngircd/irc-op.c

src/ngircd/irc-oper.c

src/ngircd/irc-server.c

src/ngircd/irc-write.c

src/ngircd/irc-write.h

src/ngircd/irc.c

src/ngircd/log.c

src/ngircd/login.c

src/ngircd/match.c

src/ngircd/messages.h

src/ngircd/ngircd.c

src/ngircd/numeric.c

src/ngircd/op.c

src/ngircd/pam.c

src/ngircd/pam.h

src/ngircd/parse.c

src/ngircd/sighandlers.c

src/portab/Makefile.ng

src/portab/portab.h

src/testsuite/ngircd-test1.conf

src/testsuite/ngircd-test2.conf

Show diffs side-by-side

added added

removed removed

contrib/Debian/changelog

contrib/Debian/ngircd.default

contrib/Debian/ngircd.init

contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj

contrib/ngircd.spec

doc/Commands.txt

doc/Protocol.txt

doc/sample-ngircd.conf.tmpl

man/ngircd.8.tmpl

man/ngircd.conf.5.tmpl

src/ipaddr/ng_ipaddr.h

src/ngircd/channel.c

src/ngircd/channel.h

src/ngircd/client.c

src/ngircd/client.h

src/ngircd/conf-ssl.h

src/ngircd/conf.c

src/ngircd/conf.h

src/ngircd/conn-encoding.c

src/ngircd/conn-func.c

src/ngircd/conn-ssl.c

src/ngircd/conn-ssl.h

src/ngircd/conn.c

src/ngircd/conn.h

src/ngircd/defines.h

src/ngircd/irc-cap.c

src/ngircd/irc-channel.c

src/ngircd/irc-encoding.c

src/ngircd/irc-info.c

src/ngircd/irc-info.c~

src/ngircd/irc-macros.h

src/ngircd/irc-metadata.c

src/ngircd/irc-mode.c

src/ngircd/irc-op.c

src/ngircd/irc-oper.c

src/ngircd/irc-server.c

src/ngircd/irc-write.c

src/ngircd/irc-write.h

src/ngircd/irc.c

src/ngircd/log.c

src/ngircd/match.c

src/ngircd/messages.h

src/ngircd/ngircd.c

src/ngircd/numeric.c

src/ngircd/op.c

src/ngircd/pam.c

src/ngircd/pam.h

src/ngircd/parse.c

src/ngircd/sighandlers.c

src/portab/Makefile.ng

src/portab/portab.h

src/portab/strndup.c

src/testsuite/ngircd-test1.conf

src/testsuite/ngircd-test2.conf

Older »