merge with dev

2019-09-11 12:45:32 +02:00
parent 6f9c8996e9 ba43437220
commit 40da546cf8
523 changed files with 1705 additions and 667 deletions
--- a/rtengine/settings.h
+++ b/rtengine/settings.h
@@ -14,7 +14,7 @@
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
- *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
 */
 #ifndef _RTSETTINGS_
 #define _RTSETTINGS_