[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Eliot-dev] Changes to eliot/game/rack.cpp [antoine-1]
From: |
eliot-dev |
Subject: |
[Eliot-dev] Changes to eliot/game/rack.cpp [antoine-1] |
Date: |
Sun, 23 Oct 2005 14:38:25 -0400 |
Index: eliot/game/rack.cpp
diff -u eliot/game/rack.cpp:1.2.2.1 eliot/game/rack.cpp:1.2.2.2
--- eliot/game/rack.cpp:1.2.2.1 Sun Oct 23 17:16:24 2005
+++ eliot/game/rack.cpp Sun Oct 23 18:38:18 2005
@@ -3,11 +3,6 @@
* Authors: Antoine Fraboulet <address@hidden>
* Olivier Teuliere <address@hidden>
*
-<<<<<<< rack.cpp
-=======
- * $Id: rack.cpp,v 1.2.2.1 2005/10/23 17:16:24 afrab Exp $
- *
->>>>>>> 1.2
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -23,7 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*****************************************************************************/
-/* $Id: rack.cpp,v 1.2.2.1 2005/10/23 17:16:24 afrab Exp $ */
+/* $Id: rack.cpp,v 1.2.2.2 2005/10/23 18:38:18 afrab Exp $ */
/**
* \file rack.h