diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 09:48:41 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 09:48:41 +0200 |
| commit | 2850da4f8cab294b2f897d170b35ec532e3c4d49 (patch) | |
| tree | 549908e5c5b1d28ba2a6a37369201079c1209a5b /starmath/prj | |
| parent | 457fe4e7e83a0fed70a07ddeb2158e02ff1bca7e (diff) | |
| parent | 5f03f0c86933b1372a96d05018610205bbd43db9 (diff) | |
Merge branch 'master' into feature/gnumake4
Conflicts:
starmath/JunitTest_sm_unoapi.mk
starmath/Library_sm.mk
starmath/Library_smd.mk
starmath/Makefile
starmath/prj/build.lst
starmath/prj/makefile.mk
starmath/qa/unoapi/Test.java
starmath/source/detreg.cxx
starmath/source/register.cxx
starmath/source/smdetect.cxx
sw/Library_sw.mk
sw/Library_swd.mk
sw/Library_swui.mk
sw/Library_vbaswobj.mk
sw/inc/iodetect.hxx
sw/inc/swddllapi.h
sw/source/filter/basflt/iodetect.cxx
Diffstat (limited to 'starmath/prj')
| -rw-r--r-- | starmath/prj/build.lst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/starmath/prj/build.lst b/starmath/prj/build.lst index 496008bddd18..6b60a031bd13 100644 --- a/starmath/prj/build.lst +++ b/starmath/prj/build.lst @@ -1,2 +1,2 @@ -sm starmath : LIBXSLT:libxslt L10N:l10n svx NULL -sm starmath\prj nmake - all sm_prj NULL +sm starmath : LIBXSLT:libxslt TRANSLATIONS:translations svx configmgr dtrans ure NULL +sm starmath\prj nmake - all sm_prj NULL |