diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:39:04 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:39:04 +0200 |
commit | ca907e02205e8e99e28608ddfe7bdaca24f23aa4 (patch) | |
tree | afdf8fb6a8aef6920ad0f658bdad85c419e0c43e /solenv/inc | |
parent | 817da75b0809642d68b3cab35a1a9348139e9321 (diff) | |
parent | 35c884841001c6367d428db8e4407afc4d5077ca (diff) |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
Makefile.in
Repository.mk
autogen.sh
bin/lo-commit-stat
configure.in
distro-configs/LibreOfficeOpenBSD.conf
distro-configs/LibreOfficeWin32.conf
instsetoo_native/util/openoffice.lst
ooo.lst.in
scp2/source/ooo/module_langpack.ulf
set_soenv.in
solenv/bin/ooinstall
solenv/gbuild/CppunitTest.mk
solenv/gbuild/Library.mk
solenv/gbuild/LinkTarget.mk
solenv/gbuild/TargetLocations.mk
solenv/gbuild/platform/macosx.mk
solenv/gbuild/platform/solaris.mk
solenv/gbuild/platform/unxgcc.mk
solenv/gbuild/platform/windows.mk
solenv/inc/minor.mk
solenv/inc/settings.mk
tail_build/prj/makefile.mk
Diffstat (limited to 'solenv/inc')
-rw-r--r-- | solenv/inc/langlist.mk | 1 | ||||
-rw-r--r-- | solenv/inc/minor.mk | 6 | ||||
-rw-r--r-- | solenv/inc/settings.mk | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk index 18680e77ce38..f4e485380ae1 100644 --- a/solenv/inc/langlist.mk +++ b/solenv/inc/langlist.mk @@ -150,6 +150,7 @@ tlh \ th \ tn \ tr \ +tk \ ts \ tg \ ug \ diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index dfd0189badb8..38646f16b5b3 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ -RSCVERSION=340 -RSCREVISION=340m1(Build:1) +RSCVERSION=350 +RSCREVISION=350m1(Build:1) BUILD=1 LAST_MINOR=m1 -SOURCEVERSION=OOO340 +SOURCEVERSION=OOO350 diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 04dfd3490387..da564bf60724 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -826,6 +826,10 @@ SOLARCOMMONSDFDIR=$(SOLARSDFDIR) .EXPORT : SOLARBINDIR +.IF "$(GUI)" == "WNT" +L10N_MODULE*=$(shell cygpath -m $(SRC_ROOT)/translations) +.ELSE +.ENDIF .IF "$(WITH_LANG)"!="" .INCLUDE .IGNORE: $(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/inc/localization_present.mk |