diff options
author | Mathias Bauer <mba@openoffice.org> | 2010-10-29 15:36:30 +0200 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2010-10-29 15:36:30 +0200 |
commit | 5eb9ea76e2b0aa72c1bd00d7f0429cb0de3bb1da (patch) | |
tree | 13cae60ce6fc9da6d413d0caa445759b221f3d7a /sw/AllLangResTarget_sw.mk | |
parent | 0fe045d9566b66b766a8dd967e65ad6d57d78e5b (diff) |
CWS gnumake2: resolve conflicts and make sources buildable on Linux
Diffstat (limited to 'sw/AllLangResTarget_sw.mk')
-rw-r--r-- | sw/AllLangResTarget_sw.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk index ba552333d2fa..5d87fa1ae587 100644 --- a/sw/AllLangResTarget_sw.mk +++ b/sw/AllLangResTarget_sw.mk @@ -153,7 +153,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\ sw/source/ui/misc/insrule.src \ sw/source/ui/misc/autocorr.src \ sw/source/ui/ribbar/tbxanchr.src \ - sw/source/ui/ribbar/tblctrl.src \ sw/source/ui/ribbar/workctrl.src \ sw/source/ui/ribbar/inputwin.src \ sw/source/ui/shells/shells.src \ |