[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Eliot-dev] Changes to eliot/dic/compdic.c [antoine-1]
From: |
eliot-dev |
Subject: |
[Eliot-dev] Changes to eliot/dic/compdic.c [antoine-1] |
Date: |
Sun, 23 Oct 2005 14:38:20 -0400 |
Index: eliot/dic/compdic.c
diff -u eliot/dic/compdic.c:1.5.2.1 eliot/dic/compdic.c:1.5.2.2
--- eliot/dic/compdic.c:1.5.2.1 Sun Oct 23 17:13:56 2005
+++ eliot/dic/compdic.c Sun Oct 23 18:38:18 2005
@@ -17,18 +17,13 @@
/* along with this program; if not, write to the Free Software */
/* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-<<<<<<< compdic.c
-/* $Id: compdic.c,v 1.5.2.1 2005/10/23 17:13:56 afrab Exp $ */
+/* $Id: compdic.c,v 1.5.2.2 2005/10/23 18:38:18 afrab Exp $ */
/**
* \file compdic.c
* \brief Program used to compress a dictionary
* \author Antoine Fraboulet
* \date 1999
-=======
-/*
- * $Id: compdic.c,v 1.5.2.1 2005/10/23 17:13:56 afrab Exp $
->>>>>>> 1.5
*/
#include <time.h>