Merge commit 'cbx/anopeng-uid' into anopeng-uid

Conflicts:

	include/extern.h
	include/services.h
	src/protocol/bahamut.c
	src/protocol/inspircd11.c


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1320 5417fbe8-f217-4b02-8779-1006273d7864

1 files changed, 0 insertions, 68 deletions

diff --git a/include/extern.h b/include/extern.h
index 9fd206177..945ca249e 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -1176,74 +1176,6 @@ E void anope_cmd_svswatch(const char *sender, const char *nick, const char *parm
 E void anope_SendCTCP(const char *source, const char *dest,  const char *fmt, ...);   	  		  /* CTCP */
 E void anope_SendNumeric(const char *, int, const char *, const char *, ...) FORMAT(printf, 4, 5); /* Numerics */
 
-EI int anope_event_482(const char *source, int ac, const char **av);
-EI int anope_event_436(const char *source, int ac, const char **av);
-EI int anope_event_away(const char *source, int ac, const char **av);
-EI int anope_event_ping(const char *source, int ac, const char **av);
-EI int anope_event_motd(const char *source, int ac, const char **av);
-EI int anope_event_join(const char *source, int ac, const char **av);
-EI int anope_event_kick(const char *source, int ac, const char **av);
-EI int anope_event_kill(const char *source, int ac, const char **av);
-EI int anope_event_mode(const char *source, int ac, const char **av);
-EI int anope_event_tmode(const char *source, int ac, const char **av);
-EI int anope_event_quit(const char *source, int ac, const char **av);
-EI int anope_event_squit(const char *source, int ac, const char **av);
-EI int anope_event_topic(const char *source, int ac, const char **av);
-EI int anope_event_whois(const char *source, int ac, const char **av);
-EI int anope_event_part(const char *source, int ac, const char **av);
-EI int anope_event_server(const char *source, int ac, const char **av);
-EI int anope_event_sid(const char *source, int ac, const char **av);
-EI int anope_event_nick(const char *source, int ac, const char **av);
-EI int anope_event_bmask(const char *source, int ac, const char **av);
-EI int anope_event_gnotice(const char *source, int ac, const char **av);
-EI int anope_event_privmsg(const char *source, int ac, const char **av);
-EI int anope_event_capab(const char *source, int ac, const char **av);
-EI int anope_event_sjoin(const char *source, int ac, const char **av);
-EI int anope_event_cs(const char *source, int ac, const char **av);
-EI int anope_event_hs(const char *source, int ac, const char **av);
-EI int anope_event_ms(const char *source, int ac, const char **av);
-EI int anope_event_ns(const char *source, int ac, const char **av);
-EI int anope_event_os(const char *source, int ac, const char **av);
-EI int anope_event_vs(const char *source, int ac, const char **av);
-EI int anope_event_svinfo(const char *source, int ac, const char **av);
-EI int anope_event_chghost(const char *source, int ac, const char **av);
-EI int anope_event_sethost(const char *source, int ac, const char **av);
-EI int anope_event_chgident(const char *source, int ac, const char **av);
-EI int anope_event_setident(const char *source, int ac, const char **av);
-EI int anope_event_chgname(const char *source, int ac, const char **av);
-EI int anope_event_setname(const char *source, int ac, const char **av);
-EI int anope_event_svsinfo(const char *source, int ac, const char **av);
-EI int anope_event_snick(const char *source, int ac, const char **av);
-EI int anope_event_vhost(const char *source, int ac, const char **av);
-EI int anope_event_tkl(const char *source, int ac, const char **av);
-EI int anope_event_eos(const char *source, int ac, const char **av);
-EI int anope_event_eob(const char *source, int ac, const char **av);
-EI int anope_event_pass(const char *source, int ac, const char **av);
-EI int anope_event_netinfo(const char *source, int ac, const char **av);
-EI int anope_event_error(const char *source, int ac, const char **av);
-EI int anope_event_eb(const char *source, int ac, const char **av);
-EI int anope_event_netctrl(const char *source, int ac, const char **av);
-EI int anope_event_notice(const char *source, int ac, const char **av);
-EI int anope_event_snotice(const char *source, int ac, const char **av);
-EI int anope_event_sqline(const char *source, int ac, const char **av);
-EI int anope_event_smo(const char *source, int ac, const char **av);
-EI int anope_event_myid(const char *source, int ac, const char **av);
-EI int anope_event_vctrl(const char *source, int ac, const char **av);
-EI int anope_event_tctrl(const char *source, int ac, const char **av);
-EI int anope_event_snetinfo(const char *source, int ac, const char **av);
-EI int anope_event_umode2(const char *source, int ac, const char **av);
-EI int anope_event_globops(const char *source, int ac, const char **av);
-EI int anope_event_swhois(const char *source, int ac, const char **av);
-EI int anope_event_burst(const char *source, int ac, const char **av);
-EI int anope_event_luserslock(const char *source, int ac, const char **av);
-EI int anope_event_admin(const char *source, int ac, const char **av);
-EI int anope_event_credits(const char *source, int ac, const char **av);
-EI int anope_event_rehash(const char *source, int ac, const char **av);
-EI int anope_event_sdesc(const char *source, int ac, const char **av);
-EI int anope_event_netglobal(const char *source, int ac, const char **av);
-EI int anope_event_invite(const char *source, int ac, const char **av);
-E int anope_event_null(const char *source, int ac, const char **av);
-
 E void anope_ProcessUsermodes(User * user, int ac, const char **av);
 E void anope_SendSVID(const char *nick, time_t ts);
 E void anope_SendSVID2(User *u, const char *ts);