diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-06-06 14:06:48 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-06-06 14:06:48 +0200 |
| commit | b6212a4a950d9091aaad62022216e8aaaa074965 (patch) | |
| tree | ed81e5f1845d4bb2dcb73e4da0c3b73d247ef0e9 /fpicker | |
| parent | Revert "Add Unity Quick List to StartCenter icon" (diff) | |
| parent | Add OxygenOffice menu-icon package support (diff) | |
| download | core-b6212a4a950d9091aaad62022216e8aaaa074965.tar.gz core-b6212a4a950d9091aaad62022216e8aaaa074965.zip | |
Merge remote-tracking branch 'origin/libreoffice-3-4'
Conflicts:
connectivity/qa/makefile.mk
sfx2/source/appl/appdata.cxx
sfx2/source/appl/appinit.cxx
sfx2/source/inc/appdata.hxx
sysui/desktop/productversion.mk
xmloff/source/forms/elementimport.cxx
Diffstat (limited to 'fpicker')
0 files changed, 0 insertions, 0 deletions