T. van der Zwan 85c8ba0100 Merge remote-tracking branch 'remotes/origin/master' ...

Conflicts:
	src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/DeviceType.java

Former-commit-id: 27aea22da889530529b5dc24f38441950594a7e5

2013-11-08 15:06:19 +01:00

..

ConfigTool

Merge remote-tracking branch 'remotes/origin/master'

2013-11-08 15:06:19 +01:00

.gitignore

Created the config tool for defining hyperion json file

2013-09-24 11:25:51 +02:00