Differences between version 14 and predecessor to the previous major change of CairoKingsbury.
Other diffs: Previous Revision, Previous Author, or view the Annotated Edit History
| Newer page: | version 14 | Last edited on Sunday, September 16, 2007 1:19:08 pm | by BruceKingsbury | Revert |
| Older page: | version 13 | Last edited on Sunday, September 16, 2007 1:16:26 pm | by BruceKingsbury | Revert |
@@ -1,9 +1,14 @@
[http://farm2.static.flickr.com/1346/648290338_6093a83ea0.jpg]
[http://zcat.wired.net.nz/img/cairo_tux.jpg]
+<<<<<<< Your version
+Cairo (aka. little egypt) is the youngest child of BruceKingsbury. She likes playing Gameboy cartridge games in [mednafen|http://mednafen.sourceforge.net/], [FretsOnFire|http://fretsonfire.sourceforge.net/],
+[Club Penguin|http://www.clubpenguin.com] and most recently, [Tremulous|http://www.tremulous.net/]
+=======
Cairo (aka. little egypt) is the youngest child of BruceKingsbury. She likes playing Gameboy cartridge games in [mednafen|http://mednafen.sourceforge.net/], [FretsOnFire|http://fretsonfire.sourceforge.net/], [Club
Penguin|http://www.clubpenguin.com] and most recently, [Tremulous|http://www.tremulous.net/]
+>>>>>>> Other version
Contact details;
* cell: 021 259 6381
