summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@novell.com>2011-03-04 21:07:11 +0000
committerMichael Meeks <michael.meeks@novell.com>2011-03-04 21:07:11 +0000
commited4bd6cd739f372ab49897b7a038fae6ed0ff1f7 (patch)
treebac93e07a9c2e44340e5ff4ce7aa3f2dc9e977ed
parentf66b9938fcdfca5870c707dca0e80f2ae8eabcc2 (diff)
fix misc merge issues
-rw-r--r--connectivity/prj/build.lst2
1 files changed, 1 insertions, 1 deletions
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index 40112ad530..9fdc4f1ce2 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -27,6 +27,6 @@ cn connectivity\source\drivers\hsqldb nmake - all cn_hsqldb cn
cn connectivity\source\parse nmake - all cn_parse cn_inc NULL
cn connectivity\source\simpledbt nmake - all cn_simpledbt cn_cmtools cn_inc NULL
cn connectivity\source\dbtools nmake - all cn_dbtools cn_simpledbt cn_cmtools cn_parse cn_res cn_sdbcx cn_inc cn_res NULL
-# cn connectivity\qa\connectivity\tools nmake - all cn_qa_tools cn_util cn_inc NULL
+cn connectivity\qa\connectivity\tools nmake - all cn_qa_tools cn_util cn_inc NULL
cn connectivity\util nmake - all cn_util cn_ado cn_mozab cn_kab cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_adabas cn_flat cn_dbase cn_hsqldb cn_macab NULL