[apertium-en-ca] 03/04: Merge tag 'upstream/0.9.3_r61232'

[Kartik Mistry]

This is an automated email from the git hooks/post-receive script.

kartik pushed a commit to branch master
in repository apertium-en-ca.

commit 611a6757332157197be6f2656b1d350ab380550c
Merge: 7d869e5 e6e0274
Author: Kartik Mistry <kartik.mistry at gmail.com>
Date:   Thu Jul 9 19:31:05 2015 +0530

    Merge tag 'upstream/0.9.3_r61232'
    
    Upstream version 0.9.3~r61232

 Makefile.am                                        | 196 ++++++-------
 apertium-en-ca.ca.dix                              | 220 +++++++++++++-
 apertium-en-ca.en-ca.dix                           | 317 +++++++++++++++++++-
 apertium-en-ca.en-ca.t1x                           |  38 ++-
 apertium-en-ca.en-ca.t2x                           |  29 +-
 apertium-en-ca.en.metadix                          | 302 ++++++++++++++++++-
 apertium-en-ca.en.tsx                              |   4 +
 configure.ac                                       |  34 +--
 dev/html-texts/README                              |   4 +
 dev/mariola/detokenizer.perl                       | 109 +++++++
 dev/mariola/lowercase.perl                         |  10 +
 .../nonbreaking_prefixes/nonbreaking_prefix.de     | 325 +++++++++++++++++++++
 .../nonbreaking_prefixes/nonbreaking_prefix.el     |   2 +
 .../nonbreaking_prefixes/nonbreaking_prefix.en     | 107 +++++++
 dev/mariola/reuse-weights.perl                     |  67 +++++
 dev/mariola/tokenizer.perl                         | 167 +++++++++++
 dev/mariola/wrap-xml.perl                          |  39 +++
 dev/odt-tests/README                               |  14 +
 dev/odt-tests/file1.odt                            | Bin 0 -> 16947 bytes
 dev/odt-tests/file2.odt                            | Bin 0 -> 19756 bytes
 dev/odt-tests/file3.odt                            | Bin 0 -> 17324 bytes
 dev/odt-tests/file4.odt                            | Bin 0 -> 10800 bytes
 dev/odt-tests/file5.odt                            | Bin 0 -> 14572 bytes
 dev/odt-tests/file6.odt                            | Bin 0 -> 16354 bytes
 dev/odt-tests/file8.odt                            | Bin 0 -> 14515 bytes
 dev/odt-tests/file9.odt                            | Bin 0 -> 91095 bytes
 en-ca.prob                                         | Bin 48284 -> 48286 bytes
 modes.xml                                          | 155 +---------
 28 files changed, 1835 insertions(+), 304 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/apertium-en-ca.git