From e5051e4aa5cfc9e80ac965a6a82e4cab8d17387c Mon Sep 17 00:00:00 2001
From: "Robin Burchell w00t@inspircd.org"
 <Robin Burchell w00t@inspircd.org@5417fbe8-f217-4b02-8779-1006273d7864>
Date: Thu, 2 Oct 2008 16:03:16 +0000
Subject: 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
---
 src/protocol/ratbox.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/protocol/ratbox.h')

diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index d9d87cfd7..b73485279 100644
--- a/src/protocol/ratbox.h
+++ b/src/protocol/ratbox.h
@@ -45,10 +45,9 @@
 #define DEFAULT_MLOCK CMODE_n | CMODE_t
 
 
-class RatboxProto : public IRCDProto {
+class RatboxProto : public IRCDTS6Proto {
 	public:
 		void SendAkillDel(const char *, const char *);
-		void cmd_topic(const char *, const char *, const char *, const char *, time_t);
 		void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *);
 		void SendSVSKill(const char *, const char *, const char *);
 		void SendSVSMode(User *, int, const char **);
@@ -56,9 +55,6 @@ class RatboxProto : public IRCDProto {
 		void SendClientIntroduction(const char *, const char *, const char *, const char *, const char *);
 		void SendKick(const char *, const char *, const char *, const char *);
 		void SendNoticeChanops(const char *, const char *, const char *);
-		void cmd_message(const char *, const char *, const char *);
-		void cmd_notice(const char *, const char *, const char *);
-		void cmd_privmsg(const char *, const char *, const char *);
 		void SendBotOp(const char *, const char *);
 		void SendQuit(const char *, const char *);
 		void SendPong(const char *, const char *);
-- 
cgit