Merged with dev, resolved conflicts, fixes to icon refs

This commit is contained in:
Thanatomanic
2018-08-13 05:11:21 +02:00
2153 changed files with 48472 additions and 193956 deletions

View File

@@ -183,9 +183,9 @@ protected:
Gtk::Image *barImage_g;
Gtk::Image *chroImage_g;
Gtk::Image *modeImage;
Gtk::Image *modeImage_g;
Gtk::Image *modeImage_g2;
Gtk::Image *modeImage0;
Gtk::Image *modeImage1;
Gtk::Image *modeImage2;
sigc::connection rconn;
void setHistInvalid ();