]> jspc29.x-matter.uni-frankfurt.de Git - mvdsensorcontrol.git/commitdiff
Merge branch 'gui_devel' of jspc29.x-matter.uni-frankfurt.de:mvdsensorcontrol into...
authorMichael Wiebusch <stratomaster@gmx.net>
Wed, 14 Aug 2013 09:21:43 +0000 (11:21 +0200)
committerMichael Wiebusch <stratomaster@gmx.net>
Wed, 14 Aug 2013 09:21:43 +0000 (11:21 +0200)

Trivial merge