]> jfr.im git - irc/rqf/shadowircd.git/commitdiff
projects / irc / rqf / shadowircd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 628eee0 1d53b42)
Automated merge with ssh://hg.atheme.org//hg/charybdis
authorWilliam Pitcock <redacted>
Fri, 29 Aug 2008 19:48:06 +0000 (14:48 -0500)
committerWilliam Pitcock <redacted>
Fri, 29 Aug 2008 19:48:06 +0000 (14:48 -0500)
1  2 
src/s_user.c patch | diff1 | diff2 | blob | history

diff --cc src/s_user.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.