[mlpack] 05/06: Merge tag 'upstream/2.2.1'

[Barak A. Pearlmutter]

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

bap pushed a commit to branch master
in repository mlpack.

commit 7f716637c33ef5c35ef22b1c1cfe02ba97282805
Merge: 24c4cc3 c37f640
Author: Barak A. Pearlmutter <barak+git at pearlmutter.net>
Date:   Wed Apr 26 15:00:20 2017 +0100

    Merge tag 'upstream/2.2.1'

 Doxyfile                                    | 2 +-
 HISTORY.md                                  | 5 +++++
 doc/guide/build.hpp                         | 4 ++--
 src/mlpack/core/util/version.hpp            | 4 ++--
 src/mlpack/methods/nca/nca_main.cpp         | 1 +
 src/mlpack/tests/matrix_completion_test.cpp | 1 +
 6 files changed, 12 insertions(+), 5 deletions(-)

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