jfr.im git - irc/freenode/ircd-seven.git/commit

]> jfr.im git - irc/freenode/ircd-seven.git/commit

projects / irc / freenode / ircd-seven.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e381269 6917ed0)

author	Stephen Bennett <redacted>
	Tue, 24 Aug 2010 21:11:28 +0000 (22:11 +0100)
committer	Stephen Bennett <redacted>
	Tue, 24 Aug 2010 21:35:58 +0000 (22:35 +0100)
commit	dee7647c0fd24adba08cf3ab74300007ad72131a
tree	25a7ca8bf4b561e41aa95d34660024e2f3792aec	tree \| snapshot (zip tar.bz2 tar.gz)
parent	e3812693d6058f3ecd8d11cceb88bf074949a0ab	commit \| diff
parent	6917ed0ebafceb3631388c71833db43e28c5ba18	commit \| diff

Merge in charybdis trunk

12 files changed:

doc/example.conf	diff1 \|	diff2 \|	blob \| history
doc/reference.conf	diff1 \|	diff2 \|	blob \| history
include/channel.h	diff1 \|	diff2 \|	blob \| history
include/client.h	diff1 \|	diff2 \|	blob \| history
include/numeric.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_cap.c	diff1 \|	diff2 \|	blob \| history
src/chmode.c	diff1 \|	diff2 \|	blob \| history
src/messages.tab	diff1 \|	diff2 \|	blob \| history
src/s_conf.c	diff1 \|	diff2 \|	blob \| history

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