[Pkg-mediawiki-commits] [wikidiff2] 02/06: Merge tag 'upstream/1.4.1'

[Kunal Mehta]

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

legoktm-guest pushed a commit to branch master
in repository wikidiff2.

commit 975a8e98af3b7bbf3c20ddb16b5d549dfd37003a
Merge: 3916e2a f1e209e
Author: Kunal Mehta <legoktm at member.fsf.org>
Date:   Tue Aug 30 17:57:36 2016 -0700

    Merge tag 'upstream/1.4.1'
    
    Upstream version 1.4.1

 .gitignore         | 25 ------------------
 DiffEngine.h       | 76 +++++++++++++++++++++++++++++++++++-------------------
 InlineDiff.cpp     |  2 +-
 README             | 23 ++++++-----------
 TableDiff.cpp      |  2 +-
 Wikidiff2.cpp      |  6 -----
 Wikidiff2.h        |  4 +--
 hhvm_wikidiff2.cpp |  7 +++--
 php_wikidiff2.cpp  | 26 ++++++++++++++++---
 tests/003.phpt     |  2 +-
 tests/005.phpt     | 25 ++++++++++++++++++
 tests/006.phpt     | 18 +++++++++++++
 12 files changed, 130 insertions(+), 86 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/wikidiff2.git