• Anthony Larcher's avatar
    Merge branch 'dev' · 87d9ad32
    Anthony Larcher authored
    # Conflicts:
    #	docs/build/doctrees/bosaris/detplot.doctree
    #	docs/build/doctrees/environment.pickle
    #	docs/build/doctrees/frontend/io.doctree
    #	docs/build/doctrees/libsvm/libsvm_core.doctree
    #	docs/build/doctrees/sidekit.doctree
    #	docs/build/doctrees/sidekit_io.doctree
    #	docs/build/doctrees/statserver.doctree
    #	docs/build/html/_modules/features_server.html
    #	docs/build/html/_modules/frontend/features.html
    #	docs/build/html/_modules/frontend/io.html
    #	docs/build/html/_modules/frontend/normfeat.html
    #	docs/build/html/_modules/sidekit_io.html
    #	docs/build/html/_modules/statserver.html
    #	docs/build/html/featuresserver.html
    #	docs/build/html/frontend/features.html
    #	docs/build/html/frontend/io.html
    #	docs/build/html/genindex.html
    #	docs/build/html/index.html
    #	docs/build/html/libsvm.html
    #	docs/build/html/libsvm/libsvm_core.html
    #	docs/build/html/objects.inv
    #	docs/build/html/py-modindex.html
    #	docs/build/html/searchindex.js
    #	docs/build/html/tutorial/featureExtraction.html
    #	docs/build/html/tutorial/shorttuto.html
    #	docs/source/conf.py
    #	nnet/feed_forward.py
    87d9ad32