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 /dmake/INSTALL | |
| 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 'dmake/INSTALL')
0 files changed, 0 insertions, 0 deletions