[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[hunspell] 01/03: Merge branch 'experimental'



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

rene pushed a commit to branch master
in repository hunspell.

commit a61d13ee2049df7080b77d228ff4c5fb77874833
Merge: 61163c3 9d53080
Author: Rene Engelhard <rene@rene-engelhard.de>
Date:   Tue May 10 19:19:40 2016 +0200

    Merge branch 'experimental'
    
    Conflicts:
    	debian/changelog
    	debian/patches/series

 ChangeLog                                          |    6 +
 NEWS                                               |    3 +
 aclocal.m4                                         |    7 +-
 config.h.in                                        |    3 -
 configure                                          |   73 +-
 configure.ac                                       |    8 +-
 debian/changelog                                   |   19 +-
 debian/control                                     |    4 +-
 debian/libhunspell-1.3-0.shlibs                    |    1 -
 ...ell-1.3-0.install => libhunspell-1.4-0.install} |    0
 debian/libhunspell-1.4-0.shlibs                    |    1 +
 debian/patches/avoid-grep-binary-match.diff        |   16 -
 debian/patches/series                              |    2 -
 debian/rules                                       |    6 +-
 po/hu.po                                           |  205 +--
 po/hunspell.pot                                    |  209 +--
 po/it.po                                           |  207 +--
 src/hunspell/Makefile.am                           |   18 +-
 src/hunspell/Makefile.in                           |   75 +-
 src/hunspell/affentry.cxx                          |  201 +--
 src/hunspell/affentry.hxx                          |    8 +-
 src/hunspell/affixmgr.cxx                          |  381 +++--
 src/hunspell/affixmgr.hxx                          |   24 +-
 src/hunspell/atypes.hxx                            |   13 +-
 src/hunspell/baseaffix.hxx                         |    2 +-
 src/hunspell/csutil.cxx                            |  520 ++-----
 src/hunspell/csutil.hxx                            |  121 +-
 src/hunspell/dictmgr.cxx                           |  216 ---
 src/hunspell/dictmgr.hxx                           |   76 -
 src/hunspell/filemgr.cxx                           |   10 +-
 src/hunspell/hashmgr.cxx                           |  193 ++-
 src/hunspell/hashmgr.hxx                           |   15 +-
 src/hunspell/hunspell.cxx                          | 1554 +++++++-------------
 src/hunspell/hunspell.dsp                          |    8 -
 src/hunspell/hunspell.hxx                          |   53 +-
 src/hunspell/makefile.mk                           |   65 -
 src/hunspell/phonet.cxx                            |   59 +-
 src/hunspell/phonet.hxx                            |    6 +-
 src/hunspell/replist.cxx                           |   20 +-
 src/hunspell/replist.hxx                           |    4 +
 src/hunspell/suggestmgr.cxx                        |  812 ++++------
 src/hunspell/suggestmgr.hxx                        |    7 +-
 src/hunspell/w_char.hxx                            |   20 +-
 src/parsers/Makefile.am                            |    2 +-
 src/parsers/Makefile.in                            |    4 +-
 src/parsers/htmlparser.cxx                         |    2 +-
 src/parsers/htmlparser.hxx                         |    2 +-
 src/parsers/latexparser.cxx                        |    3 +-
 src/parsers/latexparser.hxx                        |    2 +-
 src/parsers/manparser.cxx                          |    2 +-
 src/parsers/manparser.hxx                          |    2 +-
 src/parsers/odfparser.cxx                          |    2 +-
 src/parsers/odfparser.hxx                          |    2 +-
 src/parsers/textparser.cxx                         |   18 +-
 src/parsers/textparser.hxx                         |   10 +-
 src/parsers/xmlparser.cxx                          |    2 +-
 src/parsers/xmlparser.hxx                          |    2 +-
 src/tools/Makefile.am                              |   16 +-
 src/tools/Makefile.in                              |   91 +-
 src/tools/analyze.cxx                              |   19 +-
 src/tools/example.cxx                              |   19 +-
 src/tools/hunspell.cxx                             |  191 ++-
 src/tools/{hzip.c => hzip.cxx}                     |   22 +-
 src/tools/{munch.c => munch.cxx}                   |   45 +-
 src/tools/{unmunch.c => unmunch.cxx}               |   39 +-
 src/win_api/Hunspell.rc                            |   10 +-
 src/win_api/Makefile.cygwin                        |    1 -
 src/win_api/config.h                               |    7 +-
 src/win_api/hunspelldll.c                          |   17 -
 src/win_api/hunspelldll.h                          |    6 +-
 src/win_api/libhunspell.vcproj                     |    8 -
 tests/breakdefault.sug                             |    2 +
 tests/breakdefault.wrong                           |    2 +
 tests/suggestiontest/Makefile.orig                 |   11 -
 tests/test.sh                                      |    2 +-
 75 files changed, 2166 insertions(+), 3648 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/hunspell.git


Reply to: