Merge branch 'master' into gtk3

2017-01-06 20:12:12 +01:00
parent d8f5161ba5 a7b670dc27
commit 934f1b1513
38 changed files with 1117 additions and 968 deletions
--- a/rtgui/iptcpanel.h
+++ b/rtgui/iptcpanel.h
@@ -46,8 +46,8 @@ private:
    Gtk::Button*    addSC;
    Gtk::Button*    delSC;

-    Gtk::Entry*     author;
-    Gtk::Entry*     authorPos;
+    Gtk::Entry*     creator;
+    Gtk::Entry*     creatorJobTitle;
    Gtk::Entry*     credit;
    Gtk::Entry*     source;
    Gtk::Entry*     copyright;