diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-03-15 12:42:59 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-03-15 12:42:59 +0000 |
| commit | 3f3a04b4f57b00141620da774ff9288685034c16 (patch) | |
| tree | a5bee03d031577d9ba86e87b2f3a7f3178cd8b0f /desktop/prj | |
| parent | b82aed8e7f02baa2fd8e97ba4ec36833d0a035f9 (diff) | |
more merge fixes
Diffstat (limited to 'desktop/prj')
| -rwxr-xr-x | desktop/prj/build.lst | 2 | ||||
| -rwxr-xr-x | desktop/prj/d.lst | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst index a13732bc64c3..bef09600c23e 100755 --- a/desktop/prj/build.lst +++ b/desktop/prj/build.lst @@ -37,8 +37,8 @@ dt desktop\source\deployment\registry\configuration nmake - all dt_dp_registry_c dt desktop\source\deployment\registry\help nmake - all dt_dp_registry_help dt_inc NULL dt desktop\source\deployment\registry\executable nmake - all dt_dp_registry_executable dt_inc NULL dt desktop\scripts nmake - u dt_scripts dt_inc NULL -dt desktop\util nmake - all dt_util dt_app dt_pagein.u dt_so_comp dt_spl dt_uwrapper.u dt_usplash.u dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr dt_rebase.w NULL dt desktop\zipintro nmake - all dt_zipintro NULL +dt desktop\util nmake - all dt_util dt_app dt_pagein.u dt_so_comp dt_spl dt_uwrapper.u dt_usplash.u dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr dt_rebase.w dt_zipintro NULL dt desktop\registry\data\org\openoffice\Office nmake - all sn_regconfig NULL dt desktop\source\registration\com\sun\star\servicetag\resources get - all sn_svctagres NULL dt desktop\source\registration\com\sun\star\servicetag nmake - all sn_svctag NULL diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst index 442303258ff0..6c9f53824346 100755 --- a/desktop/prj/d.lst +++ b/desktop/prj/d.lst @@ -109,6 +109,7 @@ mkdir: %_DEST%\bin%_EXT%\odf4ms mkdir: %COMMON_DEST%\pck%_EXT%\brand mkdir: %COMMON_DEST%\pck%_EXT%\brand_dev +..\%__SRC%\bin\intro.zip %COMMON_DEST%\pck%_EXT%\intro.zip ..\%__SRC%\bin\brand\intro.zip %COMMON_DEST%\pck%_EXT%\brand\intro.zip ..\%__SRC%\bin\brand_dev\intro.zip %COMMON_DEST%\pck%_EXT%\brand_dev\intro.zip ..\%__SRC%\bin\shell\shell.zip %COMMON_DEST%\pck%_EXT%\shell.zip |