summaryrefslogtreecommitdiff
path: root/solenv/inc/minor.mk
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-05-27 20:39:04 +0200
committerJan Holesovsky <kendy@suse.cz>2011-05-27 20:39:04 +0200
commitca907e02205e8e99e28608ddfe7bdaca24f23aa4 (patch)
treeafdf8fb6a8aef6920ad0f658bdad85c419e0c43e /solenv/inc/minor.mk
parent817da75b0809642d68b3cab35a1a9348139e9321 (diff)
parent35c884841001c6367d428db8e4407afc4d5077ca (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/minor.mk')
-rw-r--r--solenv/inc/minor.mk6
1 files changed, 3 insertions, 3 deletions
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