Sebastianw Wehling-Benatelli e6b788d423 Merge branch 'develop'
Conflicts:
	QtPyLoT.py
	pylot/core/io/data.py
2016-09-02 14:24:34 +02:00
..
2016-09-02 14:24:34 +02:00
2014-03-19 12:24:41 +01:00
2016-07-27 11:12:27 +02:00