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
..
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-09-16 21:04:25 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-20 23:46:29 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-12-01 18:59:59 +01:00
2015-08-12 16:07:19 +02:00
2015-12-01 18:59:59 +01:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-09-16 21:04:25 +02:00
2016-01-06 23:56:12 +01:00
2016-01-06 23:56:12 +01:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2016-01-06 23:56:12 +01:00
2016-01-06 23:56:12 +01:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-20 23:46:29 +02:00
2015-08-20 23:46:29 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-12-09 15:44:28 +01:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-11 11:53:44 +02:00
2015-08-12 16:07:19 +02:00
2016-01-06 23:56:12 +01:00
2016-01-06 23:56:12 +01:00
2015-08-12 16:07:19 +02:00
2015-08-11 11:53:44 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2016-01-06 23:56:12 +01:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-09-27 21:17:35 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00
2016-01-06 23:56:12 +01:00
2015-08-12 16:07:19 +02:00