diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-11-12 14:37:31 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-11-12 14:37:31 +0100 |
| commit | c14b74ef7b6988cbcf80a3cfb61dbb36e0fdf7ce (patch) | |
| tree | f3c0092f6bdb1bcaa2575adc42e0b5a0e8a79676 | |
| parent | 84c20c85411e7c0496a55949b7cc7ee6b35b91ed (diff) | |
| parent | 7c1ef1cf8f5e8058505c0351e5fa43d2be90cd76 (diff) | |
Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
dictionaries/en/dictionaries.xcu
0 files changed, 0 insertions, 0 deletions