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 /framework | |
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 'framework')
-rw-r--r-- | framework/prj/build.lst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/prj/build.lst b/framework/prj/build.lst index a97c7e29161f..ab80a41682fd 100644 --- a/framework/prj/build.lst +++ b/framework/prj/build.lst @@ -1,2 +1,2 @@ -fr framework : LIBXSLT:libxslt TRANSLATIONS:translations svtools ucb NULL +fr framework : LIBXSLT:libxslt svtools ucb NULL fr framework\prj nmake - all fr_all NULL |