Markus Mäkelä c82831cc10 Fix merge conflict
An old define name caused the build to fail.
2017-02-08 09:29:26 +02:00
..
2017-02-01 09:35:13 +02:00
2017-02-08 09:29:26 +02:00
2017-02-01 09:35:13 +02:00
2017-01-17 14:48:43 +02:00
2017-02-08 09:27:00 +02:00
2017-01-26 16:14:17 +02:00
2016-12-01 15:55:25 +02:00