[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Eliot-dev] Changes to eliot/game/player.cpp [antoine-1]
From: |
eliot-dev |
Subject: |
[Eliot-dev] Changes to eliot/game/player.cpp [antoine-1] |
Date: |
Sun, 23 Oct 2005 14:38:24 -0400 |
Index: eliot/game/player.cpp
diff -u eliot/game/player.cpp:1.5.2.1 eliot/game/player.cpp:1.5.2.2
--- eliot/game/player.cpp:1.5.2.1 Sun Oct 23 17:16:24 2005
+++ eliot/game/player.cpp Sun Oct 23 18:38:18 2005
@@ -1,4 +1,3 @@
-<<<<<<< player.cpp
/* Copyright (C) 2004-2005 Eliot */
/* Authors: Olivier Teuliere <address@hidden> */
/* */
@@ -18,7 +17,7 @@
/* along with this program; if not, write to the Free Software */
/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-/* $Id: player.cpp,v 1.5.2.1 2005/10/23 17:16:24 afrab Exp $ */
+/* $Id: player.cpp,v 1.5.2.2 2005/10/23 18:38:18 afrab Exp $ */
/**
* \file player.cpp
@@ -26,28 +25,6 @@
* \author Olivier Teuliere
* \date 2005
*/
-=======
-/*****************************************************************************
- * Copyright (C) 2004-2005 Eliot
- * Authors: Olivier Teuliere <address@hidden>
- *
- * $Id: player.cpp,v 1.5.2.1 2005/10/23 17:16:24 afrab Exp $
- *
- * 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *****************************************************************************/
->>>>>>> 1.5
#include "tile.h"
#include "rack.h"