[Libreoffice-commits] .: Branch 'integration/dev300_m98' - connectivity/prj

[Michael Meeks]

 connectivity/prj/build.lst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ed4bd6cd739f372ab49897b7a038fae6ed0ff1f7
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Fri Mar 4 21:07:11 2011 +0000

    fix misc merge issues

diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index 40112ad..9fdc4f1 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