Skip to content
Snippets Groups Projects
Commit 39e42084 authored by Gael Varoquaux's avatar Gael Varoquaux
Browse files

Merge branch 'master' of git@github.com:scikit-learn/scikit-learn

Conflicts:

	scikits/learn/datasets/base.py
	scikits/learn/gmm.py
	scikits/learn/hmm.py
	scikits/learn/pipeline.py
parents 7a636fc8 bb2e0663
Branches
Tags
No related merge requests found
Showing
with 6737 additions and 35 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment