diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-04-05 20:15:24 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-04-05 20:15:24 +0200 |
| commit | 4a163cc5c2ef541d1c0ad1a3648c3717dc5bf9b3 (patch) | |
| tree | 06cb9180e45cb0c4e44067f167a93489300b44b0 /more_fonts/prj/d.lst | |
| parent | c8d8e7c9c210a79a8ae9a1414e04db0594ff1b01 (diff) | |
| parent | dde1d3be8fe16d937f3277662e7a6f5c0faffcd6 (diff) | |
Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4
Conflicts:
dictionaries/de_AT/README_extension_owner.txt
dictionaries/de_AT/makefile.mk
dictionaries/de_CH/makefile.mk
dictionaries/de_DE/makefile.mk
dictionaries/prj/build.lst
Diffstat (limited to 'more_fonts/prj/d.lst')
0 files changed, 0 insertions, 0 deletions