Adam Reichold
8151e0f5ce
Merge branch 'master' into 'gtk3'
...
Most conflicts seemed to be simple enough. There were a lot of `append_text` to
`append` conversions for `Gtk::ComboBoxText`. The `PopUpCommon` class also saw
a lot of changes with non-trivial conflict resolutions.
2016-01-06 23:56:12 +01:00
Adam Reichold
88ab82cee9
Factor out the three thumbnail browser selection modes without changing their behaviour.
2015-11-28 23:21:17 +01:00
Beep6581
35775f3b3f
synced with master (merged master into gtk3)
2015-10-17 16:23:10 +02:00
Beep6581
a51ac8b905
a little remaining astyle
2015-10-17 15:25:37 +02:00
Morgan Hardwood
56a0805bc7
Gtk3 by Hombre, issue 2807
2015-08-12 16:07:19 +02:00
DrSlony
0e0cfb9b25
Formatted all .cc and .h code in rtengine, rtexif and rtgui using astyle
2015-08-11 11:55:03 +02:00
torger
d5ca351c20
Issue 2134: removed obsolete raw highlight preservation setting from GUI (still left in procparams for backwards compatilibility)
2015-07-10 12:00:36 +02:00
