From 91e34e4ccc6c61d0b64d250817af7f0d2263b89e Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Fri, 29 Oct 2010 15:36:30 +0200
Subject: CWS gnumake2: resolve conflicts and make sources buildable on Linux

---
 toolkit/prj/build.lst | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

(limited to 'toolkit/prj')

diff --git a/toolkit/prj/build.lst b/toolkit/prj/build.lst
index e1e9b370628f..7abd412d1103 100644
--- a/toolkit/prj/build.lst
+++ b/toolkit/prj/build.lst
@@ -1,28 +1,12 @@
-<<<<<<< local
 ti toolkit : vcl NULL
 ti toolkit     usr1  - all ti_mkout NULL
 ti toolkit\prj nmake - all ti_prj NULL
-=======
-ti	toolkit	:	vcl NULL
-ti	toolkit									usr1	-	all	ti_mkout NULL
-ti	toolkit\prj								get		-	all	ti_prj NULL
-ti	toolkit\inc								nmake	-	all	ti_inc NULL
-ti	toolkit\uiconfig\layout									nmake	-	all	ti_uiconfig_layout NULL
-ti	toolkit\source\helper					nmake	-	all	ti_helper  ti_inc NULL
-ti	toolkit\source\awt						nmake	-	all	ti_awt  ti_inc NULL
-ti	toolkit\source\controls					nmake	-	all	ti_controls  ti_inc NULL
-ti	toolkit\source\controls\tree			nmake	-	all	ti_tree  NULL
-ti	toolkit\source\controls\grid			nmake	-	all	ti_grid  NULL
-ti	toolkit\source\layout\core			nmake	-	all	ti_layout_core  NULL
-ti	toolkit\source\layout\vcl			nmake	-	all	ti_layout_vcl  NULL
-ti	toolkit\util							nmake	-	all	ti_util ti_awt ti_controls ti_layout_core ti_helper ti_tree ti_grid ti_layout_vcl NULL
 
 ti      toolkit\qa\unoapi nmake - all ti_qa_unoapi NULL
 
-
 # fail on unxsoli4
 #ti      toolkit\qa\complex\xunitconversion nmake - all ti_complex_conv ti_util NULL
 
 # fails
 # ti      toolkit\qa\complex\toolkit                   nmake - all ti_complex_ti ti_qa_complex_toolkit_interface_tests ti_util NULL
->>>>>>> other
+
-- 
cgit