pu
Merge branch 'dev' of github.com:yangyingchao/wcmd into dev

Conflicts:
	src/FileProcessorUnix.cpp