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 /scp2 | |
| parent | 54cd57e03e115d6b009409e6df374603452b1378 (diff) | |
| parent | a7261b424716463a7bb157f0d79084c868e10015 (diff) | |
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 'scp2')
| -rw-r--r-- | scp2/prj/build.lst | 2 | ||||
| -rw-r--r-- | scp2/source/impress/module_ogltrans.ulf | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst index 35249814f435..19b2e9664a79 100644 --- a/scp2/prj/build.lst +++ b/scp2/prj/build.lst @@ -1,3 +1,3 @@ -cp scp2 : TRANSLATIONS:translations i18npool DESKTOP:l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL +cp scp2 : i18npool DESKTOP:l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL cp scp2 usr1 - all cp_mkout NULL cp scp2\prj nmake - all cp_prj NULL diff --git a/scp2/source/impress/module_ogltrans.ulf b/scp2/source/impress/module_ogltrans.ulf index 4415d47e76af..98ef95ff81b0 100644 --- a/scp2/source/impress/module_ogltrans.ulf +++ b/scp2/source/impress/module_ogltrans.ulf @@ -16,7 +16,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -MODULE_OPTIONAL_OGLTRANS [STR_NAME_MODULE_OPTIONAL_OGLTRANS] en-US = "OpenGL slide transitions for %PRODUCTNAME Impress" |