From 7c486606beacfad9255840e4d1258ede9286688c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnim=20L=C3=A4uger?= Date: Sun, 30 Dec 2007 16:56:35 +0000 Subject: [PATCH] fixed merge results git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@905 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- jtag/ChangeLog | 1 + jtag/data/Makefile.am | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/jtag/ChangeLog b/jtag/ChangeLog index 7a790b9e..467d1b8e 100644 --- a/jtag/ChangeLog +++ b/jtag/ChangeLog @@ -1,5 +1,6 @@ 2007-12-30 Arnim Laeuger + * data/Makefile.am (nobase_dist_pkgdata_DATA): fixed merge results * many files: integration of BSDL parser * data/xilinx/PARTS: added xc2v80-fg256,xc2v250-fg256,xc2v1000-fg256 '[ 1859678 ] jtag support for xilinx xc2v80-fg256, xc2v250, xc2v1000 FPGA' (Alexander Didebulidze) diff --git a/jtag/data/Makefile.am b/jtag/data/Makefile.am index f0bf28b1..d99ff9c1 100644 --- a/jtag/data/Makefile.am +++ b/jtag/data/Makefile.am @@ -59,7 +59,6 @@ nobase_dist_pkgdata_DATA = \ analog/bf533/bf533 \ analog/PARTS \ analog/sharc21065l/STEPPINGS \ - analog/sharc21065l/sharc21065l analog/sharc21065l/sharc21065l \ brecis/PARTS \ brecis/msp2006/STEPPINGS \