Prepare to merge 5.4 from releases back into dev

2018-03-20 13:54:02 +01:00
parent a5e8eb9c8a
commit 2efdfba293
6 changed files with 37 additions and 41 deletions
--- a/rawtherapee.astylerc
+++ b/rawtherapee.astylerc
@@ -1,8 +0,0 @@
-style=1tbs
-indent=spaces=4
-indent-switches
-break-blocks
-pad-oper
-convert-tabs
-pad-header
-unpad-paren