diff options
| author | Andras Timar <atimar@suse.com> | 2012-11-20 15:03:34 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-11-20 15:03:34 +0100 |
| commit | fa88b3717d58410f6318c520b0397000f86b9720 (patch) | |
| tree | ad8f1b2135ebe8045de55e5af233ff442d901444 /sfx2 | |
| parent | Updated core (diff) | |
| parent | Updated core (diff) | |
| download | core-fa88b3717d58410f6318c520b0397000f86b9720.tar.gz core-fa88b3717d58410f6318c520b0397000f86b9720.zip | |
Merge branch 'feature/killsdf'
Conflicts:
desktop/prj/build.lst
helpcontent2
l10ntools/Executable_gsicheck.mk
l10ntools/Executable_uiex.mk
regexp/inc/regexp/reclass.hxx
solenv/gbuild/AllLangResTarget.mk
Change-Id: I398f0cd9e7daefa8d2e04fd977d5bc2e9708169b
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/prj/build.lst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index e56d8946fece..7a97de18b158 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -1,2 +1,2 @@ -sf sfx2 : TRANSLATIONS:translations NATIVE:idl basic xmlscript framework readlicense_oo shell sax LIBXML2:libxml2 LIBXSLT:libxslt NULL +sf sfx2 : NATIVE:idl basic xmlscript framework readlicense_oo shell sax LIBXML2:libxml2 LIBXSLT:libxslt NULL sf sfx2\prj nmake - all sf_prj NULL |