diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-02-08 00:10:21 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-02-08 00:10:21 +0100 |
| commit | 18e39b8c4da749e0cad428e7f35931d02e9ecc9f (patch) | |
| tree | ccdf98efbc4dae2ec5050cf74c80c7b5e2ecf381 /setup_native/source/win32/customactions/reg64/reg64.cxx | |
| parent | 95132670c54791614d34e0ec5751b5c09d4c02f9 (diff) | |
| parent | fa01a166515fe2bcf7309e0bc3f71accb8a981ba (diff) | |
Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
cui/source/tabpages/swpossizetabpage.cxx
Diffstat (limited to 'setup_native/source/win32/customactions/reg64/reg64.cxx')
0 files changed, 0 insertions, 0 deletions