commit aa231247f5bb31edd439db2f22598f46de0baa70 Author: Sukhbir Singh sukhbir@torproject.org Date: Sat Mar 19 07:48:59 2016 -0400

Rebase CTCP patches --- projects/instantbird/ctcp-ping.patch | 3 +-- projects/instantbird/ctcp-time.patch | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/projects/instantbird/ctcp-ping.patch b/projects/instantbird/ctcp-ping.patch index fb09179..9bc452f 100644 --- a/projects/instantbird/ctcp-ping.patch +++ b/projects/instantbird/ctcp-ping.patch @@ -1,8 +1,7 @@ diff --git a/chat/protocols/irc/ircCTCP.jsm b/chat/protocols/irc/ircCTCP.jsm -index 5722479..4c2d5bf 100644 --- a/chat/protocols/irc/ircCTCP.jsm +++ b/chat/protocols/irc/ircCTCP.jsm -@@ -167,19 +167,7 @@ var ctcpBase = { +@@ -167,19 +167,7 @@ },

// Used to measure the delay of the IRC network between clients. diff --git a/projects/instantbird/ctcp-time.patch b/projects/instantbird/ctcp-time.patch index 20572e0..4336592 100644 --- a/projects/instantbird/ctcp-time.patch +++ b/projects/instantbird/ctcp-time.patch @@ -1,8 +1,7 @@ diff --git a/chat/protocols/irc/ircCTCP.jsm b/chat/protocols/irc/ircCTCP.jsm -index 5722479..6b82caa 100644 --- a/chat/protocols/irc/ircCTCP.jsm +++ b/chat/protocols/irc/ircCTCP.jsm -@@ -195,7 +195,7 @@ var ctcpBase = { +@@ -195,7 +195,7 @@ if (aMessage.command == "PRIVMSG") { // TIME // Received a TIME request, send a human readable response.