[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Eliot-dev] Changes to eliot/game/duplicate.cpp [antoine-1]
From: |
eliot-dev |
Subject: |
[Eliot-dev] Changes to eliot/game/duplicate.cpp [antoine-1] |
Date: |
Sun, 23 Oct 2005 14:38:22 -0400 |
Index: eliot/game/duplicate.cpp
diff -u eliot/game/duplicate.cpp:1.9.2.1 eliot/game/duplicate.cpp:1.9.2.2
--- eliot/game/duplicate.cpp:1.9.2.1 Sun Oct 23 17:16:24 2005
+++ eliot/game/duplicate.cpp Sun Oct 23 18:38:18 2005
@@ -2,10 +2,6 @@
* Copyright (C) 2005 Eliot
* Authors: Olivier Teuliere <address@hidden>
*
-<<<<<<< duplicate.cpp
-=======
- * $Id: duplicate.cpp,v 1.9.2.1 2005/10/23 17:16:24 afrab Exp $
->>>>>>> 1.9
*
* 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
@@ -22,7 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*****************************************************************************/
- /* $Id: duplicate.cpp,v 1.9.2.1 2005/10/23 17:16:24 afrab Exp $ */
+ /* $Id: duplicate.cpp,v 1.9.2.2 2005/10/23 18:38:18 afrab Exp $ */
#include "dic.h"
#include "tile.h"