louib 242faa138b Add custom icons when merging. (#1008)
* Adding missing custom icons on merge.
* qDebug when adding icon
* Adding test for merge custom icons.
2017-10-07 10:40:29 -04:00
..
2015-09-12 13:55:50 +02:00
2017-09-24 18:00:12 -04:00
2016-10-28 18:51:09 +02:00
2016-10-28 18:51:09 +02:00
2015-10-15 18:02:31 +02:00
2017-03-10 16:11:55 +01:00
2015-09-26 11:44:27 +02:00
2016-10-02 21:45:54 -04:00
2016-10-02 21:45:54 -04:00
2017-09-24 18:00:12 -04:00
2017-09-24 18:00:12 -04:00
2016-10-28 18:51:09 +02:00