summaryrefslogtreecommitdiff
path: root/instsetoo_native
diff options
context:
space:
mode:
authorIngo Schmidt <is@openoffice.org>2010-05-25 12:16:57 +0200
committerIngo Schmidt <is@openoffice.org>2010-05-25 12:16:57 +0200
commitd9345b2386f3aaf8d7a12b51415392adebdf6fd1 (patch)
treed71d0988a35e4a9cefe60f897426c74ba67c9613 /instsetoo_native
parent0b1fe36065eb83978b1897f23002c5af875e2650 (diff)
#i111450# fixing merge bug in openoffice.lst
Diffstat (limited to 'instsetoo_native')
-rw-r--r--instsetoo_native/util/openoffice.lst3
1 files changed, 0 insertions, 3 deletions
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 30da95e51c97..297ce32ef8c9 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -93,7 +93,6 @@ OpenOffice
DOWNLOADBANNER ooobanner.bmp
DOWNLOADBITMAP ooobitmap.bmp
DOWNLOADSETUPICO ooosetup.ico
- WINDOWSBITMAPDIRECTORY ..\inc_broffice\windows\msi_templates\Binary
RELATIVE_PATHES_IN_DDF 1
STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
@@ -160,7 +159,6 @@ OpenOffice_wJRE
DOWNLOADBANNER ooobanner.bmp
DOWNLOADBITMAP ooobitmap.bmp
DOWNLOADSETUPICO ooosetup.ico
- WINDOWSBITMAPDIRECTORY ..\inc_broffice\windows\msi_templates\Binary
RELATIVE_PATHES_IN_DDF 1
STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
@@ -232,7 +230,6 @@ OpenOffice_Dev
DOWNLOADBANNER ooobanner.bmp
DOWNLOADBITMAP ooobitmap.bmp
DOWNLOADSETUPICO ooosetup.ico
- WINDOWSBITMAPDIRECTORY ..\inc_broffice\windows\msi_templates\Binary
LOCALUSERDIR $ORIGIN/..
RELATIVE_PATHES_IN_DDF 1
STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794