diff options
author | Adam <Adam@anope.org> | 2013-03-21 23:40:16 -0500 |
---|---|---|
committer | Adam <Adam@anope.org> | 2013-03-21 23:40:16 -0500 |
commit | d27aa0350067eec6e53011fc0ac49c439fbd357f (patch) | |
tree | 73499358d396bd9dede91bd40b75878b774676f0 | |
parent | dcffa5da6fe7aad26860973af5651f7c59902343 (diff) | |
parent | a2d69fa43161de054ce1239947f42a067661f469 (diff) |
Merge branch '1.9' of github.com:anope/anope into 1.9
-rw-r--r-- | modules/protocol/inspircd12.cpp | 3 | ||||
-rw-r--r-- | modules/protocol/inspircd20.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp index 1a7f338c1..d0253450a 100644 --- a/modules/protocol/inspircd12.cpp +++ b/modules/protocol/inspircd12.cpp @@ -1199,7 +1199,6 @@ class ProtoInspIRCd : public Module Message::SQuit message_squit; Message::Stats message_stats; Message::Topic message_topic; - Message::Version message_version; /* Our message handlers */ IRCDMessageChgIdent message_chgident; @@ -1226,7 +1225,7 @@ class ProtoInspIRCd : public Module ircd_proto(this), message_away(this), message_error(this), message_join(this), message_kick(this), message_kill(this), message_motd(this), message_part(this), message_ping(this), message_privmsg(this), message_quit(this), - message_squit(this), message_stats(this), message_topic(this), message_version(this), + message_squit(this), message_stats(this), message_topic(this), message_chgident(this), message_setname(this, "SETNAME"), message_chgname(this, "FNAME"), message_capab(this), message_endburst(this), message_fhost(this, "FHOST"), message_sethost(this, "SETHOST"), message_fjoin(this), message_fmode(this), message_ftopic(this), diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp index 632c60a3c..64c5f8f2e 100644 --- a/modules/protocol/inspircd20.cpp +++ b/modules/protocol/inspircd20.cpp @@ -633,7 +633,6 @@ class ProtoInspIRCd : public Module Message::SQuit message_squit; Message::Stats message_stats; Message::Topic message_topic; - Message::Version message_version; /* InspIRCd 1.2 message handlers */ ServiceAlias message_endburst, message_fhost, message_fjoin, message_fmode, @@ -656,7 +655,7 @@ class ProtoInspIRCd : public Module ircd_proto(this), message_away(this), message_error(this), message_join(this), message_kick(this), message_kill(this), message_motd(this), message_part(this), message_ping(this), message_privmsg(this), message_quit(this), - message_squit(this), message_stats(this), message_topic(this), message_version(this), + message_squit(this), message_stats(this), message_topic(this), message_endburst("IRCDMessage", "inspircd20/endburst", "inspircd12/endburst"), message_fhost("IRCDMessage", "inspircd20/fhost", "inspircd12/fhost"), |