]> 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>
Sun, 11 Aug 2013 16:04:46 +0000 (18:04 +0200)
committerMichael Wiebusch <stratomaster@gmx.net>
Sun, 11 Aug 2013 16:04:46 +0000 (18:04 +0200)

Trivial merge