f4exb 4670cbaa33 Merge branch 'master' into dev		2018-04-22 07:48:13 +02:00
..
app.pro	Merge branch 'master' into dev	2018-03-14 19:18:20 +01:00
main.cpp	Merge branch 'master' into dev	2018-04-22 07:48:13 +02:00