diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:58:44 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:58:44 +0100 |
commit | 5f08d6e5a4383db99a1ed314181b594a338200dc (patch) | |
tree | 12fda47cee050e541880785f349cb98438ce1972 /solenv/inc/minor.mk | |
parent | faae793ae86558e42f948b89920665be402db1f8 (diff) | |
parent | e3511dc343c944530c6c48e6990b4f4f8d522535 (diff) |
Merge commit 'ooo/DEV300_m103'
Conflicts:
configure
configure.in
instsetoo_native/util/openoffice.lst
set_soenv.in
solenv/bin/cws.pl
solenv/bin/modules/installer/simplepackage.pm
solenv/gbuild/LinkTarget.mk
solenv/gbuild/extensions/post_PackModule.mk
solenv/gbuild/platform/linux.mk
solenv/gbuild/platform/macosx.mk
solenv/gbuild/platform/windows.mk
solenv/inc/installationtest.mk
solenv/inc/minor.mk
soltools/cpp/_eval.c
Diffstat (limited to 'solenv/inc/minor.mk')
-rw-r--r-- | solenv/inc/minor.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index f828ae6400de..e33ce16abc3f 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=300 -RSCREVISION=300m101(Build:1) +RSCREVISION=300m103(Build:1) BUILD=1 -LAST_MINOR=m101 +LAST_MINOR=m103 SOURCEVERSION=DEV300 |