diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-07-28 18:33:58 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-07-28 18:33:58 +0200 |
| commit | a95376174ec70c4a75569ce6dafacb0f696b21bc (patch) | |
| tree | c1b813dddd1c32efb22913cc3b2f5813e6d901ff /dmake | |
| parent | edb451c490fe72ced8df20829c7fbc0da93e672c (diff) | |
| parent | 6760b5695c4461126a34a84f64fd7114eff23143 (diff) | |
Merge commit 'libreoffice-3.4.2.3'
Conflicts:
Makefile.in
configure.in
instsetoo_native/util/makefile.mk
instsetoo_native/util/openoffice.lst
ooo.lst.in
set_soenv.in
solenv/inc/minor.mk
Diffstat (limited to 'dmake')
0 files changed, 0 insertions, 0 deletions