Merge jv
authorMerge Script
Fri, 10 Jun 2016 07:10:50 +0200
branchjv
changeset 3700 673d3009a02d
parent 3697 17c27ec3e0cd (current diff)
parent 3699 0c2e41e211f7 (diff)
child 3702 302fdbf441aa
Merge
bc.mak
--- a/.hgtags	Tue Jun 07 06:40:38 2016 +0200
+++ b/.hgtags	Fri Jun 10 07:10:50 2016 +0200
@@ -72,6 +72,8 @@
 ebf1067a3289e238cdd38bfa97f0e4d23b77d5f9 expecco_1_7_1rc4
 ed7a9aa41ba4c8be2ac39ff65f13cbda01f649fe expecco_2_9_0
 ed7a9aa41ba4c8be2ac39ff65f13cbda01f649fe expecco_2_9_0_a
+ed7a9aa41ba4c8be2ac39ff65f13cbda01f649fe expecco_2_9_0_win75_lx36
+ed7a9aa41ba4c8be2ac39ff65f13cbda01f649fe expecco_2_9_1
 ef7d38d397bc2733ce8646c436ceb48e3191e32f expecco_2_0_0
 ef7d38d397bc2733ce8646c436ceb48e3191e32f expecco_2_0_0_0
 fb54a0eabe13bf49bb363bbcf7a87bfd30a233b2 rel5_1_3
--- a/bc.mak	Tue Jun 07 06:40:38 2016 +0200
+++ b/bc.mak	Fri Jun 10 07:10:50 2016 +0200
@@ -105,9 +105,9 @@
 test: $(TOP)\goodies\builder\reports\NUL
 	pushd $(TOP)\goodies\builder\reports & $(MAKE_BAT)
 	$(TOP)\goodies\builder\reports\report-runner.bat -D . -r Builder::TestReport -p $(PACKAGE)
-        
+
 clean::
-	del *.$(CSUFFIX)
+	-del *.$(CSUFFIX)
 
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it