mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2025-03-01 10:33:28 +00:00
Conflicts: src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/DeviceType.java Former-commit-id: 27aea22da889530529b5dc24f38441950594a7e5