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-11 11:53:44 +02:00
2015-08-11 11:55:03 +02:00
2015-11-27 23:19:45 +01:00
2015-10-10 01:05:08 +02:00
2015-09-16 00:14:58 +02:00
2015-11-03 19:13:36 +01:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-11-28 14:53:34 +01:00
2015-11-28 14:53:34 +01:00
2015-11-10 00:58:54 +01:00
2015-08-11 11:55:03 +02:00
2015-08-17 13:31:20 +02:00
2015-08-17 13:31:20 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-07-10 12:00:36 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-09-11 21:04:29 +02:00
2015-10-17 14:45:24 +02:00
2015-10-17 14:45:24 +02:00
2015-08-11 11:55:03 +02:00
2015-09-08 09:56:30 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-20 02:33:46 +02:00
2015-08-20 02:33:46 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-11-12 08:58:07 +01:00
2015-11-12 08:58:07 +01:00
2015-11-28 14:53:27 +01:00
2015-09-30 17:45:36 +02:00
2015-07-10 12:00:36 +02:00
2016-01-02 14:28:48 +01:00
2015-08-11 11:53:44 +02:00
2016-01-02 14:28:48 +01:00
2015-07-10 12:00:36 +02:00
2016-01-03 15:48:22 +01:00
2016-01-01 19:43:09 +01:00
2015-09-08 09:56:30 +02:00
2015-08-12 16:07:19 +02:00
2015-08-11 11:55:03 +02:00
2015-10-06 22:29:44 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-07-10 12:00:36 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-20 02:33:46 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-11-03 14:17:56 +01:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-10-17 14:45:24 +02:00
2015-10-14 23:15:01 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2016-01-03 15:48:22 +01:00
2016-01-03 15:48:22 +01:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-11-10 21:24:03 +01:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-15 17:44:46 +02:00
2015-08-11 11:55:03 +02:00
2015-11-13 08:45:24 +01:00
2016-01-03 16:56:21 +01:00
2016-01-03 15:48:22 +01:00
2016-01-03 15:48:22 +01:00
2016-01-03 15:48:22 +01:00
2015-09-16 00:14:58 +02:00
2015-11-28 14:53:34 +01:00
2016-01-03 15:48:22 +01:00
2015-08-11 11:55:03 +02:00
2015-11-15 16:57:02 +01:00
2015-09-16 00:14:58 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-12-09 01:54:47 +01:00
2015-11-11 14:33:35 +01:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-11-28 14:53:27 +01:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-18 13:50:06 +02:00
2015-09-16 00:14:58 +02:00
2015-10-17 16:23:10 +02:00
2015-08-12 16:07:19 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2016-01-04 02:39:55 +01:00
2016-01-03 15:48:22 +01:00
2016-01-03 15:48:22 +01:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2016-01-01 15:44:58 +01:00
2015-11-13 08:45:24 +01:00
2015-08-11 11:55:03 +02:00
2016-01-04 02:39:55 +01:00
2016-01-03 15:48:22 +01:00
2015-08-11 11:55:03 +02:00
2016-01-03 15:48:22 +01:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2016-01-05 19:32:51 +01:00
2016-01-05 19:32:51 +01:00
2015-08-11 11:55:03 +02:00
2016-01-03 15:48:22 +01:00
2015-11-13 08:45:24 +01:00
2015-11-12 08:58:07 +01:00
2016-01-03 16:56:21 +01:00
2015-08-11 11:55:03 +02:00
2015-08-09 20:56:10 +02:00
2015-08-11 11:55:03 +02:00
2015-10-01 21:16:47 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-11 11:55:03 +02:00
2015-08-12 13:27:45 +02:00
2015-10-02 23:01:56 +02:00
2015-11-27 23:19:45 +01:00
2015-08-12 16:07:19 +02:00
2015-08-12 16:07:19 +02:00