Merge branch 'master' into gtk3-merge-master-b8eb349

2016-10-10 23:07:41 +02:00
parent d16d244fc5 b8eb3492c9
commit 0dbea030cb
166 changed files with 15898 additions and 2285 deletions
--- a/rtgui/dirpyrequalizer.cc
+++ b/rtgui/dirpyrequalizer.cc
@@ -14,7 +14,7 @@
 *  You should have received a copy of the GNU General Public License
 *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
 *
- *  © 2010 Emil Martinec <ejmartin@uchicago.edu>
+ *  (C) 2010 Emil Martinec <ejmartin@uchicago.edu>
 */

 #include "dirpyrequalizer.h"