diff -u -r1.3 -r1.4 --- TODO 25 Oct 2005 18:53:37 -0000 1.3 +++ TODO 25 Oct 2005 18:53:46 -0000 1.4 @@ -1,4 +1,3 @@
-<<<<<<< TODO
-make src.sh scripts fully configurable -tarball locations -CVSROOTs