Markus Mäkelä aa412b4fe3 Fix merge conflict
2.0 used old define names.
2017-02-20 12:42:11 +02:00
..
2017-02-14 21:42:28 +02:00
2017-02-14 21:42:28 +02:00
2017-02-20 12:42:11 +02:00
2017-02-20 11:17:49 +02:00
2017-02-14 21:42:28 +02:00
2017-02-14 21:42:28 +02:00
2017-02-14 21:42:28 +02:00
2017-02-14 21:42:28 +02:00
2017-02-14 21:42:28 +02:00