diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-04-05 17:48:49 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-04-05 17:48:49 +0200 |
| commit | 51c05e1cf9c3b7fcc257329521e304d51554b2ae (patch) | |
| tree | fb73b3cd52610ee218b5c9aa8e4c84243559f305 /instsetoo_native/util/update.xml | |
| parent | 2e705f35c2478a542c04cbccfc2fd227c2047b20 (diff) | |
| parent | 586fc09447275103461ed76e932c0ace826bf0b7 (diff) | |
Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4
Conflicts:
instsetoo_native/util/openoffice.lst
solenv/inc/minor.mk
Diffstat (limited to 'instsetoo_native/util/update.xml')
0 files changed, 0 insertions, 0 deletions