Merge branch 'gui_devel' of jspc29.x-matter.uni-frankfurt.de:mvdsensorcontrol into...
authorMichael Wiebusch <stratomaster@gmx.net>
Thu, 1 Aug 2013 08:29:37 +0000 (10:29 +0200)
committerMichael Wiebusch <stratomaster@gmx.net>
Thu, 1 Aug 2013 08:29:37 +0000 (10:29 +0200)
commit9c7e8c0ec05c9d1b5dbaffbc2646a5fac000ee28
tree532cf8324cb1a5f4a6ed35c3bcff795d00e4033a
parent065cac2127271327363e97f0424013b15c24e43d
parentfdac040f38b4e237c9d82120431cae7772b5467d
Merge branch 'gui_devel' of jspc29.x-matter.uni-frankfurt.de:mvdsensorcontrol into gui_devel