[vlfeat] 40/44: Merge branch 'upstream'

[Dima Kogan]

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

dkogan-guest pushed a commit to branch master
in repository vlfeat.

commit 3dbf78d6c4fd781d326020c1022b0a6d9583ea03
Merge: f69ee7d a2c8355
Author: Dima Kogan <dima at secretsauce.net>
Date:   Mon Aug 31 00:01:21 2015 -0700

    Merge branch 'upstream'

 Makefile                                           |  10 +-
 Makefile.mak                                       |   6 +-
 README.md                                          |   3 +-
 docsrc/index.html                                  |  16 ++-
 docsrc/vlfeat-website-main-content.xml             |   2 +-
 docsrc/vlfeat-website-template.xml                 |   8 +-
 docsrc/vlfeat.css                                  |   3 +-
 make/doc.mak                                       |  14 ++-
 make/matlab.mak                                    |  61 ++++++++--
 toolbox/fisher/vl_fisher.c                         |   2 +-
 toolbox/gmm/vl_gmm.m                               |   5 +-
 toolbox/imop/vl_imsc.m                             |   1 +
 toolbox/kmeans/vl_kmeans.c                         |   1 -
 toolbox/kmeans/vl_kmeans.m                         |   4 +
 toolbox/plotop/vl_pr.m                             |   2 +-
 toolbox/plotop/vl_roc.m                            |  10 ++
 vl/covdet.c                                        |   8 +-
 vl/fisher.c                                        |  46 +++++---
 vl/generic.c                                       |  24 ++--
 vl/generic.h                                       |   2 +-
 vl/gmm.c                                           |  36 ++++--
 vl/hog.c                                           | 123 +++++++++++----------
 vl/liop.c                                          |   2 +
 vl/mathop.c                                        |   2 +-
 vl/vlad.c                                          |   4 +-
 vlfeat.sln                                         |   6 +-
 .../xcshareddata/xcschemes/make info.xcscheme      |  11 +-
 .../xcshareddata/xcschemes/make.xcscheme           |   9 ++
 28 files changed, 277 insertions(+), 144 deletions(-)

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