Annotate

TODO @ 525:32122251d2fe

Remove stray merge marker
author Matthew Wild <mwild1@gmail.com>
date Wed, 03 Dec 2008 16:01:58 +0000
parent 414:405d414fbce2
child 1520:218075f1daf4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5
57e4eb3aeac0 Added all the files to please hg :/
matthew@silver
parents:
diff changeset
1 - On-the-fly code updates
22
2856dfc1f5cc Various documentation updates, and added names.txt :)
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
2 - Control/statistics interface
96
70202f7f1830 Updated TODO
Matthew Wild <mwild1@gmail.com>
parents: 22
diff changeset
3 - External components
22
2856dfc1f5cc Various documentation updates, and added names.txt :)
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
4 - Ad-hoc commands
3
f674eb704134 "Shared roster" - well, kind of :)
matthew
parents:
diff changeset
5 - Clustering
4
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 3
diff changeset
6 - Pubsub/PEP
414
405d414fbce2 Update TODO
Matthew Wild <mwild1@gmail.com>
parents: 96
diff changeset
7
405d414fbce2 Update TODO
Matthew Wild <mwild1@gmail.com>
parents: 96
diff changeset
8