update
Merge branch 'master' of https://github.com/cxjwin/uncrustify.cfg

Conflicts:
	uncrustify.cfg