Ignore:
Timestamp:
06/28/2016 02:25:42 PM (10 years ago)
Author:
jdalbey
Message:

Merge 305 modifications into trunk.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/tmcsim/cadsimulator/CADSimulatorFixture.java

    r26 r47  
    3434            + "ATMSProperties         = empty.txt\n" 
    3535            + "MediaProperties        = empty.txt\n"; 
    36     static final String configpData = "ParamicsCommHost = 192.168.251.45\n" 
     36    static final String paramicsData = "ParamicsCommHost      = 192.168.251.45\n" 
    3737            + "ParamicsCommPort       = 4450\n" 
    3838            + "IncidentUpdateInterval = 30\n" 
     
    6060        System.setOut(ps); 
    6161        writedata("config.txt", configData); 
    62         writedata("pconfig.txt", configpData); 
    63         writedata("pmcprops.txt", paramConfig); 
     62        writedata("pconfig.txt", paramicsData); 
    6463        writedata("empty.txt", ""); 
    6564        writeScriptfiles(); 
Note: See TracChangeset for help on using the changeset viewer.