merge with dev

2019-09-11 11:41:24 +02:00
parent 0c8a31f6b8 ba43437220
commit 00df4707a8
523 changed files with 1703 additions and 661 deletions
--- a/rtgui/wavelet.h
+++ b/rtgui/wavelet.h
@@ -12,7 +12,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/>.
 *
 *  2014 Jacques Desmis <jdesmis@gmail.com>
 */