Merge branch 'master' of https://gitbucket.getenv.net/git/jph/masterarbeit
Conflicts:
	usedMcode/callAll.m
commit f0246300589e4c4e92a0c9cfe94ede39653f2f2f
2 parents 1fdcac2 + 3683ba8
@jph jph authored on 25 Jul 2016
Showing 2 changed files
View
usedMcode/callAll.m
View
usedMcode/svmEciton.m