Correcting issues in default objc.cfg
Allow removal or addition of newlines after blocks.
Merge pull request #205 from loudnate/patch-1

Correcting issues in default objc.cfg
Merge branch 'alanf/space-between-block-and-square-brace' of https://github.com/alanf/uncrustify into alanf-alanf/space-between-block-and-square-brace
Whitespace cleanup.
Fix option name: nl_brace_fparen
Add option nl_brace_fparen to make test 30752 pass again
Update test 30750 for new option nl_brace_fparen
Fix UniversalIndentGUI comment for newline options
Fix build on Windows

Added the missing include statements to build uncrustify
on Windows (using Visual Studio Express 2013).
Differentiate between normal ternary (a ? b : c) and short ternary, (b ?: c) with option sp_cond_ternary_short
Clean up formatting.
Fix typo in documentation
Merge pull request #231 from Lykurg/fixspelling

Fix typo in documentation
Merge remote-tracking branch 'upstream/master' into HEAD

Conflicts:
	tests/input/oc/ternary.m
	tests/objective-c.test
	tests/output/oc/50016-ternary.m