[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Eliot-dev] Changes to eliot/wxwin/Makefile.am [antoine-1]
From: |
eliot-dev |
Subject: |
[Eliot-dev] Changes to eliot/wxwin/Makefile.am [antoine-1] |
Date: |
Sun, 23 Oct 2005 15:12:17 -0400 |
Index: eliot/wxwin/Makefile.am
diff -u eliot/wxwin/Makefile.am:1.6.2.1 eliot/wxwin/Makefile.am:1.6.2.2
--- eliot/wxwin/Makefile.am:1.6.2.1 Sun Oct 23 17:10:46 2005
+++ eliot/wxwin/Makefile.am Sun Oct 23 19:12:14 2005
@@ -1,33 +1,14 @@
-<<<<<<< Makefile.am
-# Eliot
-# Copyright (C) 1999 Antoine Fraboulet
-#
-# This file is part of Eliot.
-#
-# Eliot 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.
-#
-# Eliot 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-=======
# Eliot
# Copyright (C) 1999 Antoine Fraboulet
-# address@hidden
#
-# This program is free software; you can redistribute it and/or modify
+# This file is part of Eliot.
+#
+# Eliot 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,
+# Eliot 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.
@@ -35,9 +16,8 @@
# 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.6
-# $Id: Makefile.am,v 1.6.2.1 2005/10/23 17:10:46 afrab Exp $
+# $Id: Makefile.am,v 1.6.2.2 2005/10/23 19:12:14 ipkiss Exp $
if BUILD_WXWIDGETS