Mercurial > hg > anonet-resdb

changeset 225:f983a3b6a7ab draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'master' of git://git1.somerandomnick.ano Conflicts: doc/www.anonet2.org/public_pod/index.pod
author root <root@HAL2000.(none)>
date Tue, 26 Oct 2010 18:13:42 -0500
parents cdf40c2439e9 (diff) 74772c760d9c (current diff)
children abee74e3817d
files doc/www.anonet2.org/public_pod/index.pod
diffstat 1 files changed, 19 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/doc/www.anonet2.org/public_pod/index.pod	Tue Oct 26 23:03:15 2010 +0200
+++ b/doc/www.anonet2.org/public_pod/index.pod	Tue Oct 26 18:13:42 2010 -0500
@@ -22,7 +22,19 @@
 =item webchat
 L<KwaakNet|http://anortr.ucis.nl:8086/?channels=anonet&nick=Anonymous> (anonymous)
 
+<<<<<<< HEAD
+L<sevilNatas (KwaakNet)|http://www.sevilnatas.ano/chat.html> (automatically hide your identity)
+
+=item webchat
+
+L<KwaakNet|http://anortr.ucis.nl:8086/?channels=anonet&nick=Anonymous> (partially hides your identity)
+
+=item webchat
+
+L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (doesn't hide your identity)
+=======
 L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (not anonymous)
+>>>>>>> 38fdf66238d67bb4e04b57e19bdcb4507c23c313
 
 =item IRC chat
 L<SRN|irc://anortr.ucis.nl:8804/RendezVous> (hides your identity)
@@ -45,9 +57,13 @@
 
 =item webchat
 
+<<<<<<< HEAD
+L<KwaakNet|http://1.3.3.2:8086/?channels=anonet&nick=Anonymous> (partially hides your identity)
+=======
 L<KwaakNet|http://1.3.3.2:8086/?channels=anonet&nick=Anonymous> (hides your identity)
 
 L<sevilNatas (KwaakNet)|http://www.sevilnatas.ano/chat.html> (doesn't automatically hide your identity)
+>>>>>>> 38fdf66238d67bb4e04b57e19bdcb4507c23c313
 
 =item IRC
 
@@ -318,8 +334,9 @@
 
 =item *
 
-Webchat (looking to relay to IRC, L<http://www.sevilnatas.ano/chat/>)
-Webchat (L<http://www.sevilnatas.ano/chat.html>)
+IRC Webchat Client (L<http://www.sevilnatas.ano/chat.html>)
+IRC-Like Chat Rooms [NO ACTIVATION OR VALID EMAILS REQUIRED (looking to relay to IRC, L<http://www.sevilnatas.ano/chat/>)]
+
 
 =item *