[mlpack-git] master: Merge pull request #542 from stereomatchingkiss/fix_name_conflict (bc2bd17)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/8ffa4700430ec1b5541333673c7a7d11568c90d0...bc2bd172e1d1d0f5fcbcfafffedecba9d6e47a91

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

commit bc2bd172e1d1d0f5fcbcfafffedecba9d6e47a91
Merge: 8ffa470 0616233
Author: Marcus Edel <marcus.edel at fu-berlin.de>
Date:   Fri Mar 4 13:14:38 2016 +0100

    Merge pull request #542 from stereomatchingkiss/fix_name_conflict
    
    Fix bug--ann constructor hide the name of network.


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

bc2bd172e1d1d0f5fcbcfafffedecba9d6e47a91
 src/mlpack/methods/ann/cnn_impl.hpp | 12 ++++++------
 src/mlpack/methods/ann/ffn_impl.hpp | 12 ++++++------
 src/mlpack/methods/ann/rnn_impl.hpp | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)