summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2012-11-20 15:03:34 +0100
committerAndras Timar <atimar@suse.com>2012-11-20 15:03:34 +0100
commitfa88b3717d58410f6318c520b0397000f86b9720 (patch)
treead8f1b2135ebe8045de55e5af233ff442d901444 /shell
parent54cd57e03e115d6b009409e6df374603452b1378 (diff)
parenta7261b424716463a7bb157f0d79084c868e10015 (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 'shell')
-rw-r--r--shell/prj/build.lst2
1 files changed, 1 insertions, 1 deletions
diff --git a/shell/prj/build.lst b/shell/prj/build.lst
index 47722524f47e..83c4a9195064 100644
--- a/shell/prj/build.lst
+++ b/shell/prj/build.lst
@@ -1,2 +1,2 @@
-sl shell : TRANSLATIONS:translations offapi tools sal EXPAT:expat LIBXSLT:libxslt NULL
+sl shell : offapi tools sal EXPAT:expat LIBXSLT:libxslt NULL
sl shell\prj nmake - all sl_prj NULL