Merge origin/master
Conflicts: examples/src/ViskitOpenDis7Examples/viskitProject.xml
Showing
- .gitignore 5 additions, 3 deletions.gitignore
- build.xml 1 addition, 0 deletionsbuild.xml
- examples/nbproject/project.properties 242 additions, 121 deletionsexamples/nbproject/project.properties
- examples/src/ViskitOpenDis7Examples/lib/Networked_Graphics_MV3500_examples.jar 0 additions, 0 deletions...enDis7Examples/lib/Networked_Graphics_MV3500_examples.jar
- examples/src/ViskitOpenDis7Examples/viskitProject.xml 1 addition, 1 deletionexamples/src/ViskitOpenDis7Examples/viskitProject.xml
- presentations/11a_Certificates_PKI.ppt 0 additions, 0 deletionspresentations/11a_Certificates_PKI.ppt
- presentations/11b_SimulationAsAService.ppt 0 additions, 0 deletionspresentations/11b_SimulationAsAService.ppt
- presentations/11c_Clouds_Virtualization.ppt 0 additions, 0 deletionspresentations/11c_Clouds_Virtualization.ppt
- viskit/MyViskitProjects/DefaultProject/EventGraphs/examples/TransferLineComponent.xml 0 additions, 68 deletions...ultProject/EventGraphs/examples/TransferLineComponent.xml
- viskit/MyViskitProjects/DefaultProject/viskitProject.xml 16 additions, 17 deletionsviskit/MyViskitProjects/DefaultProject/viskitProject.xml
- viskit/configuration/c_app.xml 2 additions, 1 deletionviskit/configuration/c_app.xml
- viskit/lib/viskit.jar 0 additions, 0 deletionsviskit/lib/viskit.jar
Loading
Please register or sign in to comment