Fix: conflit cvs

This commit is contained in:
Regis Houssin 2006-02-03 17:50:46 +00:00
parent 062b61cc53
commit 7d7e475e66
2 changed files with 3 additions and 3 deletions

View File

@ -3,8 +3,8 @@
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
*
* 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

View File

@ -32,7 +32,7 @@
\version $Revision$
*/
define('DOL_VERSION','2.0.0-alpha2');
define('DOL_VERSION','2.1-alpha');
// La fonction clearstatcache ne doit pas etre appelé de manière globale car ralenti.
// Elle doit etre appelé uniquement par les pages qui ont besoin d'un cache fichier vidé