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 | 402d72bb06b943873ca157207231f74c375f79d1 (patch) | |
| tree | f64023a08018b8c7648a6bad5ac9a3596a3004e5 /solenv/inc/minor.mk | |
| parent | 573dc169fd3f91662d42f5ceb6dacf09f3096f59 (diff) | |
| parent | 446a2d2f7a311e4bc6c8dc32bc97bd8d97d47c89 (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 f828ae640..e33ce16ab 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 |