diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:39:41 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:39:41 +0200 |
commit | b06c861fa2492d73e1994ac6bb091ba2987d4df5 (patch) | |
tree | d6fabffe25f412aee566d4403a20835915037f2f /extras | |
parent | 501c772e011de644ec3a9f4a3bbd1543878972ff (diff) | |
parent | 668382d57eb0411824aa428a58598028a372ecdf (diff) |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
extras/source/wordbook/makefile.mk
extras/source/wordbook/oracle.dic
Diffstat (limited to 'extras')
-rw-r--r-- | extras/source/autotext/lang/it/standard.bau | bin | 44669 -> 49477 bytes |
-rw-r--r-- | extras/source/autotext/lang/nl-BE/acor_nl-BE.dat | bin | 0 -> 18310 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/extras/source/autotext/lang/it/standard.bau b/extras/source/autotext/lang/it/standard.bau Binary files differindex 37dc3d492d36..1d1679c62508 100644 --- a/extras/source/autotext/lang/it/standard.bau +++ b/extras/source/autotext/lang/it/standard.bau diff --git a/extras/source/autotext/lang/nl-BE/acor_nl-BE.dat b/extras/source/autotext/lang/nl-BE/acor_nl-BE.dat Binary files differnew file mode 100644 index 000000000000..ecfe671f9699 --- /dev/null +++ b/extras/source/autotext/lang/nl-BE/acor_nl-BE.dat |