From: divVerent <divVerent@xonotic.org>
Date: Fri, 18 Feb 2011 21:57:00 +0000 (+0000)
Subject: (Commit created by redmine exporter script from page "Channels" version 11)
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c9b2389a392569b9d6266930c58b91feca3194a3;p=xonotic%2Fxonotic.wiki.git

(Commit created by redmine exporter script from page "Channels" version 11)
---

diff --git a/Channels.textile b/Channels.textile
index 73b1fc1..f1b24ec 100644
--- a/Channels.textile
+++ b/Channels.textile
@@ -1,8 +1,8 @@
-h1. IRC channels
+h1. IRC and IM channels
 
 {{>toc}}
 
-h2. On Quakenet
+h2. On Quakenet (IRC)
 
 #xonotic - General purpose channel
 #xonotic.admins - Channel for server admins
@@ -11,7 +11,7 @@ h2. On Quakenet
 #xonotic.pickup - Pickup channel
 #xonotic.tourney - Tourney channel
 
-h3. Country specific channels
+h3. Country specific IRC channels
 
 #xonotic.au - Xonotic Australia
 #xonotic.de - Xonotic Germany
@@ -50,6 +50,10 @@ h2. On FreeNode
 
 #xonotic - Game developer channel. Non-development subjects should be directed to the main Xonotic channel on QuakeNet.
 
+h2. Jabber
+
+[[xmpp:xonotic@conference.jabber.ru]] - Russian channel
+
 h1. IRC