Simon Hausmann
070d9333a6
Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
coin/provisioning/qtci-osx-10.10-x86_64/android.sh
coin/provisioning/qtci-osx-10.11-x86_64/android.sh
Change-Id: I2c3ae694d05ffe502967595fc7c7cfc6ddae4d4d
2017-04-25 12:37:26 +02:00
..
2017-04-21 06:22:10 +00:00
2017-01-11 10:05:59 +00:00
2016-11-22 14:29:51 +00:00
2017-04-03 12:06:27 +00:00
2017-04-20 05:20:54 +00:00
2017-01-12 22:19:30 +01:00
2016-12-07 13:48:24 +00:00
2017-04-04 05:06:46 +00:00
2017-04-25 12:37:26 +02:00
2016-12-21 11:32:28 +00:00
2016-12-21 11:32:28 +00:00
2017-04-24 19:19:00 +00:00
2017-04-24 19:19:00 +00:00
2017-04-03 12:06:27 +00:00
2017-04-03 12:06:27 +00:00
2017-04-08 16:04:53 +02:00
2017-04-03 12:06:27 +00:00
2017-04-08 16:04:53 +02:00