Merge branch 'master' of git.246060.ru:f1x1t/uncrustify

This commit is contained in:
Andrei Astafev 2019-05-31 14:25:19 +03:00
commit 0f0d578961

View File

@ -1386,7 +1386,7 @@ nl_try_brace = ignore # ignore/add/remove/force
nl_getset_brace = ignore # ignore/add/remove/force
# Add or remove newline between 'for' and '{'.
nl_for_brace = ignore # ignore/add/remove/force
nl_for_brace = add # ignore/add/remove/force
# Add or remove newline before the '{' of a 'catch' statement, as in
# 'catch (decl) <here> {'.
@ -1609,7 +1609,7 @@ nl_func_call_end_multi_line = false # true/false
nl_oc_msg_args = false # true/false
# Add or remove newline between function signature and '{'.
nl_fdef_brace = ignore # ignore/add/remove/force
nl_fdef_brace = add # ignore/add/remove/force
# Add or remove newline between C++11 lambda signature and '{'.
nl_cpp_ldef_brace = remove # ignore/add/remove/force