Stefan Kögl 12138a9f57 Merge branch 'master' of repos.ctdo.de:psychose ... Conflicts: ekgplotter/ekgplotter/main.py		2014-04-27 15:48:32 +02:00
..
texter	Merge branch 'master' of repos.ctdo.de:psychose	2014-04-27 15:48:32 +02:00
setup.py	added desktop entry	2014-04-12 10:12:57 +02:00