frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Former-commit-id: 27aea22da889530529b5dc24f38441950594a7e5
This commit is contained in:
T. van der Zwan
2013-11-08 15:06:19 +01:00
parent caa249c54e 212ce35861
commit 85c8ba0100
10 changed files with 368 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/config-tool/ConfigTool/src/org/hyperion/hypercon/test/TesConfigWriter.java
View File

@@ -22,7 +22,7 @@ public class TesConfigWriter {
deviceConfig.mColorByteOrder = ColorByteOrder.BGR;
deviceConfig.mName = "DAG";
deviceConfig.mOutput = "/dev/null";
deviceConfig.mType = DeviceType.ldp6803;
deviceConfig.mType = DeviceType.lpd6803;
ConfigurationFile configFile = new ConfigurationFile();