Merge branch 'master' into gtk3

2016-06-11 16:55:53 +02:00
parent ca71a0b7d2 49a6af275e
commit 038f53aded
3 changed files with 6 additions and 6 deletions
--- a/rawtherapee.astylerc
+++ b/rawtherapee.astylerc
@@ -1,5 +1,6 @@
 style=1tbs
 indent=spaces=4
+indent-switches
 break-blocks
 pad-oper
 convert-tabs