Merge branch 'master' into dcp_speedup

This commit is contained in:
Flössie 2016-06-12 12:27:22 +02:00
commit 5f6781a741
3 changed files with 5 additions and 3 deletions

View File

@ -33,7 +33,7 @@ Developement contributors, in last name alphabetical order:
Ingo Weyrich Ingo Weyrich
Makoto Yoshida Makoto Yoshida
Other contributors (profiles, ideas, mockups, testing, forum activity, translations, etc.), in last name/nickname alphabetical order: Other contributors (profiles, ideas, mockups, testing, forum activity, translations, etc.), in last name alphabetical order:
Marcin Bajor Marcin Bajor
Thorsten Bartolomäus Thorsten Bartolomäus

View File

@ -32,7 +32,8 @@ LIVE CHAT WITH USERS AND DEVELOPERS
Network: freenode Network: freenode
Server: chat.freenode.net Server: chat.freenode.net
Channel #rawtherapee Channel #rawtherapee
Or use freenode webchat to chat without installing anything:
You can use freenode webchat to communicate without installing anything:
http://webchat.freenode.net/?randomnick=1&channels=rawtherapee&prompt=1 http://webchat.freenode.net/?randomnick=1&channels=rawtherapee&prompt=1
More information here: http://rawpedia.rawtherapee.com/IRC More information here: http://rawpedia.rawtherapee.com/IRC
@ -44,5 +45,5 @@ http://plus.google.com/106783532637761598368
REVISION HISTORY REVISION HISTORY
---------------- ----------------
The complete changelog is available at: The complete changelog is available at:
https://github.com/Beep6581/RawTherapee/commits/master https://github.com/Beep6581/RawTherapee/commits/

View File

@ -1,5 +1,6 @@
style=1tbs style=1tbs
indent=spaces=4 indent=spaces=4
indent-switches
break-blocks break-blocks
pad-oper pad-oper
convert-tabs convert-tabs