...
...
ok.
Merge branch 'master' of https://github.com/echoline/PocketSphinxLauncher

Conflicts:
	defs.mk
	trainer/Makefile
	trainer/conf.c
	trainer/main.c
	trainer/tools/makedoth.c