diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:07:18 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:07:18 +0200 |
| commit | fc1e9f253dd07362065f2be9691be89fb9b3f84f (patch) | |
| tree | 89ff0b4e6733af107e34d1513df55479951b5221 /solenv/inc/minor.mk | |
| parent | 535bee89a2f5aab6f997688313e47343cef298ea (diff) | |
| parent | 5c8186bdd389fc05224d33add32e944d3f96dc27 (diff) | |
Merge branch 'DEV300_m106' into libreoffice-3-4
Conflicts:
Module_ooo.mk
Repository.mk
configure
configure.in
ooo.lst
scp2/source/ooo/file_library_ooo.scp
scp2/source/ooo/makefile.mk
scp2/source/ooo/module_hidden_ooo.scp
solenv/config/sdev300.ini
solenv/config/ssolar.cmn
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/ComponentTarget.mk
solenv/gbuild/CppunitTest.mk
solenv/gbuild/Deliver.mk
solenv/gbuild/JavaClassSet.mk
solenv/gbuild/JunitTest.mk
solenv/gbuild/Library.mk
solenv/gbuild/LinkTarget.mk
solenv/gbuild/Module.mk
solenv/gbuild/Output.mk
solenv/gbuild/SdiTarget.mk
solenv/gbuild/TargetLocations.mk
solenv/gbuild/gbuild.mk
solenv/gbuild/platform/linux.mk
solenv/gbuild/platform/macosx.mk
solenv/gbuild/platform/solaris.mk
solenv/gbuild/platform/windows.mk
solenv/gbuild/platform/winmingw.mk
solenv/inc/minor.mk
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 6d45a96930c9..cbfc3b99eff7 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=300 -RSCREVISION=300m103(Build:2) +RSCREVISION=300m106(Build:2) BUILD=2 -LAST_MINOR=m103 +LAST_MINOR=m106 SOURCEVERSION=DEV300 |