jfr.im git - irc/rqf/shadowircd.git/commit

]> jfr.im git - irc/rqf/shadowircd.git/commit

projects / irc / rqf / shadowircd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 90728ed 7d65a05)

author	B.Greenham <redacted>
	Mon, 11 Oct 2010 15:58:39 +0000 (11:58 -0400)
committer	B.Greenham <redacted>
	Mon, 11 Oct 2010 15:58:39 +0000 (11:58 -0400)
commit	40232936744bba4ca2e347dc8cafeb36f30bb35b
tree	2bd88c72a342f3951098c24b401b931106fd7fce	tree \| snapshot (zip tar.gz tar.bz2)
parent	90728edb58caf951f87d11d73390a7b39f3a48fb	commit \| diff
parent	7d65a051ebef7784e2b76e608f6057ef29ead028	commit \| diff

Merge.

13 files changed:

doc/example.conf	diff1 \|	diff2 \|	blob \| history
doc/reference.conf	diff1 \|	diff2 \|	blob \| history
include/channel.h	diff1 \|	diff2 \|	blob \| history
include/s_conf.h	diff1 \|	diff2 \|	blob \| history
modules/core/m_join.c	diff1 \|	diff2 \|	blob \| history
modules/core/m_message.c	diff1 \|	diff2 \|	blob \| history
modules/core/m_mode.c	diff1 \|	diff2 \|	blob \| history
modules/m_info.c	diff1 \|	diff2 \|	blob \| history
src/channel.c	diff1 \|	diff2 \|	blob \| history
src/chmode.c	diff1 \|	diff2 \|	blob \| history
src/newconf.c	diff1 \|	diff2 \|	blob \| history
src/s_conf.c	diff1 \|	diff2 \|	blob \| history
src/s_user.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.