Mercurial > hg > anonet-resdb

comparison doc/www.anonet2.org/public_pod/index.pod @ 227:abee74e3817d 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 21:26:17 -0500
parents f983a3b6a7ab e02a20171ee0
children da3307e29b62
comparison
equal deleted inserted replaced
225:f983a3b6a7ab 227:abee74e3817d
20 =over 20 =over
21 21
22 =item webchat 22 =item webchat
23 L<KwaakNet|http://anortr.ucis.nl:8086/?channels=anonet&nick=Anonymous> (anonymous) 23 L<KwaakNet|http://anortr.ucis.nl:8086/?channels=anonet&nick=Anonymous> (anonymous)
24 24
25 <<<<<<< HEAD
25 <<<<<<< HEAD 26 <<<<<<< HEAD
26 L<sevilNatas (KwaakNet)|http://www.sevilnatas.ano/chat.html> (automatically hide your identity) 27 L<sevilNatas (KwaakNet)|http://www.sevilnatas.ano/chat.html> (automatically hide your identity)
27 28
28 =item webchat 29 =item webchat
29 30
33 34
34 L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (doesn't hide your identity) 35 L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (doesn't hide your identity)
35 ======= 36 =======
36 L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (not anonymous) 37 L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (not anonymous)
37 >>>>>>> 38fdf66238d67bb4e04b57e19bdcb4507c23c313 38 >>>>>>> 38fdf66238d67bb4e04b57e19bdcb4507c23c313
39 =======
40 L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (not anonymous)
41 >>>>>>> 303adb66a2ac12428a90362187ba7ba6f6822333
38 42
39 =item IRC chat 43 =item IRC chat
40 L<SRN|irc://anortr.ucis.nl:8804/RendezVous> (hides your identity) 44 L<SRN|irc://anortr.ucis.nl:8804/RendezVous> (hides your identity)
41 45
42 L<UFO|irc://anortr.ucis.nl:8805/anonet> (hides your identity) 46 L<UFO|irc://anortr.ucis.nl:8805/anonet> (hides your identity)
55 59
56 =over 60 =over
57 61
58 =item webchat 62 =item webchat
59 63
64 <<<<<<< HEAD
60 <<<<<<< HEAD 65 <<<<<<< HEAD
61 L<KwaakNet|http://1.3.3.2:8086/?channels=anonet&nick=Anonymous> (partially hides your identity) 66 L<KwaakNet|http://1.3.3.2:8086/?channels=anonet&nick=Anonymous> (partially hides your identity)
62 ======= 67 =======
63 L<KwaakNet|http://1.3.3.2:8086/?channels=anonet&nick=Anonymous> (hides your identity) 68 L<KwaakNet|http://1.3.3.2:8086/?channels=anonet&nick=Anonymous> (hides your identity)
64 69
65 L<sevilNatas (KwaakNet)|http://www.sevilnatas.ano/chat.html> (doesn't automatically hide your identity) 70 L<sevilNatas (KwaakNet)|http://www.sevilnatas.ano/chat.html> (doesn't automatically hide your identity)
66 >>>>>>> 38fdf66238d67bb4e04b57e19bdcb4507c23c313 71 >>>>>>> 38fdf66238d67bb4e04b57e19bdcb4507c23c313
72 =======
73 L<KwaakNet|http://1.3.3.2:8086/?channels=anonet&nick=Anonymous> (hides your identity)
74
75 L<sevilNatas (KwaakNet)|http://www.sevilnatas.ano/chat.html> (doesn't automatically hide your identity)
76 >>>>>>> 303adb66a2ac12428a90362187ba7ba6f6822333
67 77
68 =item IRC 78 =item IRC
69 79
70 L<SRN|irc://irc.somerandomnick.ano:6667/RendezVous> 80 L<SRN|irc://irc.somerandomnick.ano:6667/RendezVous>
71 (L<SRN|irc://1.0.27.103:6667/RendezVous>, if you don't have DNS for some 81 (L<SRN|irc://1.0.27.103:6667/RendezVous>, if you don't have DNS for some