~armagetronad-dev/armagetronad/0.2.8-armagetronad-work

Viewing all changes in revision 777.

  • Committer: Manuel Moos
  • Date: 2008-03-19 20:23:14 UTC
  • mfrom: (775.1.2 armagetronad)
  • Revision ID: z-man@users.sf.net-20080319202314-36j2sl34bdnxv42a
Automatic merging of commits that would change history order:
   ------------------------------------------------------------
   revno: 775.1.2
   committer: Manuel Moos <z-man@users.sf.net>
   branch nick: armagetronad
   timestamp: Wed 2008-03-19 21:02:00 +0100
   message:
     Test commit from bzr.
   ------------------------------------------------------------
   revno: 775.1.1
   committer: Manuel Moos <z-man@users.sf.net>
   branch nick: 0.2.8-armagetronad-work
   timestamp: Wed 2008-03-19 20:45:00 +0100
   message:
     Empty merge to keep the peace between svn and bzr.
   ------------------------------------------------------------
   revno: 770.1.4
   committer: epsy
   branch nick: 0.2.8
   timestamp: Wed 2008-03-19 20:21:23 +0100
   message:
     redo
   ------------------------------------------------------------
   revno: 770.1.3
   committer: epsy
   branch nick: 0.2.8
   timestamp: Wed 2008-03-19 20:19:36 +0100
   message:
     undo
   ------------------------------------------------------------
   revno: 770.1.2
   committer: Manuel Moos <z-man@users.sf.net>
   branch nick: 0.2.8-armagetronad-work
   timestamp: Wed 2008-03-19 20:12:10 +0100
   message:
     Empty merge to keep the peace between svn and bzr.
   ------------------------------------------------------------
   revno: 770.1.1
   committer: Manuel Moos <z-man@users.sf.net>
   branch nick: 0.2.8
   timestamp: Wed 2008-03-19 19:56:58 +0100
   message:
     Fixed AI player names in client and removed debug breakpoints from tColoredString:RemoveColors

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: