summaryrefslogtreecommitdiff
path: root/forms
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 /forms
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 'forms')
-rw-r--r--forms/prj/build.lst2
1 files changed, 1 insertions, 1 deletions
diff --git a/forms/prj/build.lst b/forms/prj/build.lst
index 599b6c7de5e7..b48cd5d58935 100644
--- a/forms/prj/build.lst
+++ b/forms/prj/build.lst
@@ -1,4 +1,4 @@
-fm forms : TRANSLATIONS:translations oovbaapi salhelper svx sfx2 QADEVOOO:qadevOOo LIBXSLT:libxslt NULL
+fm forms : oovbaapi salhelper svx sfx2 QADEVOOO:qadevOOo LIBXSLT:libxslt NULL
fm forms usr1 - all fm_mkofrm NULL
fm forms\prj nmake - all fm_prj NULL