[mlpack-git] mlpack-2.1.x: Merge branch 'master' into mlpack-2.1.x (c88518c)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : mlpack-2.1.x
Link       : https://github.com/mlpack/mlpack/compare/46eede6ccb80c81c8daaf82bb15806005f792ed5...c88518c3daf917e5dd0f6342928b9b5d0434c08d

>---------------------------------------------------------------

commit c88518c3daf917e5dd0f6342928b9b5d0434c08d
Merge: 46eede6 91564ff
Author: Ryan Curtin <ryan at ratml.org>
Date:   Sun Oct 30 14:41:01 2016 -0400

    Merge branch 'master' into mlpack-2.1.x


>---------------------------------------------------------------

c88518c3daf917e5dd0f6342928b9b5d0434c08d
 src/mlpack/methods/approx_kfn/drusilla_select_impl.hpp |  2 +-
 src/mlpack/methods/approx_kfn/qdafn_impl.hpp           | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)