diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:39:30 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:39:30 +0200 |
| commit | 88c1a56d1127376284095465cf85f5b4e71a08e5 (patch) | |
| tree | 4b7ae852d8a8b86f9125b9218d36faf574b9a1a7 /setup_native/prj | |
| parent | 779b389116e7112c7ca29cb08e56cfcb043ecc4d (diff) | |
| parent | 84d9f0ceb2048550acf763879993348fb1cfb473 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
extensions/source/svg/svgaction.cxx
extensions/source/svg/svguno.cxx
package/source/xstor/owriteablestream.cxx
package/source/xstor/xstorage.cxx
package/source/zippackage/ZipPackageStream.cxx
setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
Diffstat (limited to 'setup_native/prj')
| -rw-r--r-- | setup_native/prj/build.lst | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/setup_native/prj/build.lst b/setup_native/prj/build.lst index 8de5498f122e..edd50fd90ebc 100644 --- a/setup_native/prj/build.lst +++ b/setup_native/prj/build.lst @@ -4,7 +4,6 @@ pk setup_native\scripts\source nmake - u sn_sour pk setup_native\scripts nmake - u sn_scripts sn_source.u NULL pk setup_native\source\mac nmake - u sn_mac NULL pk setup_native\source\win32\customactions\tools nmake - w sn_tools NULL -pk setup_native\source\win32\customactions\relnotes nmake - w sn_relnotes NULL pk setup_native\source\win32\customactions\rebase nmake - w sn_rebase NULL pk setup_native\source\win32\customactions\regactivex nmake - w sn_regactivex NULL pk setup_native\source\win32\customactions\regpatchactivex nmake - w sn_regpatchactivex NULL |