diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-10-06 13:35:21 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-10-06 13:35:21 +0200 |
| commit | 542a0e91f425b05bc4fb402777f0068c2a8159f4 (patch) | |
| tree | 778fad1d2f39e3b54584d2643cddf0fdc78a9d86 /sdext/prj | |
| parent | 9cdba569d3b93b8b6ca6f655816236db503784a9 (diff) | |
| parent | 1bf218731b864f73403a2cf653d8fd231f6e392f (diff) | |
Merge commit 'ooo/OOO330_m9'
Conflicts:
swext/mediawiki/build.xml
swext/prj/build.lst
Diffstat (limited to 'sdext/prj')
| -rw-r--r-- | sdext/prj/build.lst | 2 | ||||
| -rw-r--r-- | sdext/prj/d.lst | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sdext/prj/build.lst b/sdext/prj/build.lst index c593a265f26e..3603afbae866 100644 --- a/sdext/prj/build.lst +++ b/sdext/prj/build.lst @@ -1,4 +1,4 @@ -dx sdext : l10n offuh comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg XPDF:xpdf LIBXSLT:libxslt NULL +dx sdext : l10n offuh comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg XPDF:xpdf LIBXSLT:libxslt xmlhelp NULL dx sdext usr1 - all sdext_mkout NULL dx sdext\prj get - all sdext_prj NULL dx sdext\source\minimizer nmake - all sdext_minimizer sdext_minimizer_rdoooe sdext_minimizer_rdooo sdext_inc NULL diff --git a/sdext/prj/d.lst b/sdext/prj/d.lst index 6d0ca9c36424..fbf4dbf8fe2a 100644 --- a/sdext/prj/d.lst +++ b/sdext/prj/d.lst @@ -8,4 +8,6 @@ mkdir: %_DEST%\bin%_EXT%\pdfimport ..\%__SRC%\bin\pdfunzip.* %_DEST%\bin%_EXT%\pdfunzip.* ..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin%_EXT%\pdfimport\pdfimport.oxt ..\%__SRC%\bin\presentation-minimizer.oxt %_DEST%\bin%_EXT%\minimizer\presentation-minimizer.oxt +..\%__SRC%\bin\presentation_minimizer_develop.zip %_DEST%\bin%_EXT%\minimizer\presentation_minimizer_develop.zip ..\%__SRC%\bin\presenter-screen.oxt %_DEST%\bin%_EXT%\presenter\presenter-screen.oxt +..\%__SRC%\bin\presenter-screen_develop.zip %_DEST%\bin%_EXT%\presenter\presenter-screen_develop.zip |