liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with dev

Browse Source
This commit is contained in:
Desmis
2019-04-28 07:35:21 +02:00
parent 496602f714 bd2ee13e7b
commit 39eda87f4a
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -1,8 +1,8 @@
cmake_minimum_required(VERSION 3.5)
# Compiler id for Apple Clang
if(APPLE) if(APPLE)
cmake_minimum_required(VERSION 3.3)
cmake_policy(SET CMP0025 NEW) cmake_policy(SET CMP0025 NEW)
else()
cmake_minimum_required(VERSION 2.8.8)
endif() endif()
# Must stay before the project() command: # Must stay before the project() command:

2
LICENSE.txt
View File

@@ -1,6 +1,6 @@
RawTherapee - A powerful, cross-platform raw image processing program. RawTherapee - A powerful, cross-platform raw image processing program.
Copyright (C) 2004-2012 Gabor Horvath <hgabor@rawtherapee.com> Copyright (C) 2004-2012 Gabor Horvath <hgabor@rawtherapee.com>
Copyright (C) 2010-2018 RawTherapee development team. Copyright (C) 2010-2019 RawTherapee development team.
RawTherapee is free software: you can redistribute it and/or modify RawTherapee is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

5
com.rawtherapee.RawTherapee.appdata.xml
View File

@@ -26,6 +26,7 @@
<keyword>pp3</keyword> <keyword>pp3</keyword>
<keyword>graphics</keyword> <keyword>graphics</keyword>
</keywords> </keywords>
<content_rating type="oars-1.0" />
<metadata_license>CC-BY-SA-4.0</metadata_license> <metadata_license>CC-BY-SA-4.0</metadata_license>
<project_license>GPL-3.0+</project_license> <project_license>GPL-3.0+</project_license>
<url type="bugtracker">https://github.com/Beep6581/RawTherapee/issues/new</url> <url type="bugtracker">https://github.com/Beep6581/RawTherapee/issues/new</url>
@@ -36,8 +37,8 @@
<launchable type="desktop-id">rawtherapee.desktop</launchable> <launchable type="desktop-id">rawtherapee.desktop</launchable>
<releases> <releases>
<release version="5.6" date="2019-04-20" type="stable"></release> <release version="5.6" date="2019-04-20" type="stable"></release>
<release version="5.6-rc2" date="2019-04-17" type="development"></release> <release version="5.6~rc2" date="2019-04-17" type="development"></release>
<release version="5.6-rc1" date="2019-04-10" type="development"></release> <release version="5.6~rc1" date="2019-04-10" type="development"></release>
<release version="5.5" date="2018-12-17" type="stable"></release> <release version="5.5" date="2018-12-17" type="stable"></release>
</releases> </releases>
<provides> <provides>

2
rtgui/thumbbrowserbase.cc
View File

@@ -788,7 +788,7 @@ bool ThumbBrowserBase::Internal::on_key_press_event (GdkEventKey* event)
bool ThumbBrowserBase::Internal::on_button_press_event (GdkEventButton* event) bool ThumbBrowserBase::Internal::on_button_press_event (GdkEventButton* event)
{ {
// Gtk signals automatically acquire the GUI (i.e. this method is enclosed by gdk_thread_enter and gdk_thread_leave) // Gtk signals automatically acquire the GUI (i.e. this method is enclosed by gdk_thread_enter and gdk_thread_leave)
//grab_focus (); grab_focus ();
parent->eventTime = event->time; parent->eventTime = event->time;