Merge origin/master (0ae5d9fc) · Commits · Savage / NetworkedGraphicsMV3500 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

NetworkedGraphicsMV3500
- Activity
- Members

Snippets Groups Projects

0ae5d9fc

Commit 0ae5d9fc authored 8 months ago by rojas

Downloads
- Plain Diff

Merge origin/master

Conflicts:
	examples/src/ViskitOpenDis7Examples/lib/Networked_Graphics_MV3500_examples.jar

parents ad584050 f12cd243

No related branches found

No related tags found

No related merge requests found

Changes 12

Expand all Hide whitespace changes

Inline Side-by-side

Showing

assignments/src/MV3500Cohort2024JulySeptember/homework3/Lennon/LennonSimulationProgram.java 421 additions, 0 deletions

...lySeptember/homework3/Lennon/LennonSimulationProgram.java
assignments/src/MV3500Cohort2024JulySeptember/homework3/Lennon/package-info.java 10 additions, 0 deletions

...ohort2024JulySeptember/homework3/Lennon/package-info.java
assignments/src/MV3500Cohort2024JulySeptember/homework3/Smith/ExampleSimulationProgram.java 249 additions, 352 deletions

...lySeptember/homework3/Smith/ExampleSimulationProgram.java
build.properties 4 additions, 4 deletions

build.properties
build.xml 1 addition, 1 deletion

build.xml
examples/nbproject/project.properties 121 additions, 121 deletions

examples/nbproject/project.properties
examples/src/UdpExamples/UnicastUdpSender.java 4 additions, 4 deletions

examples/src/UdpExamples/UnicastUdpSender.java
examples/src/ViskitOpenDis7Examples/Assemblies/dis7/ArrivalProcessOpenDis7Assembly.xml 1 addition, 0 deletions

...amples/Assemblies/dis7/ArrivalProcessOpenDis7Assembly.xml
examples/src/ViskitOpenDis7Examples/Assemblies/dis7/SimpleServerDis7Assembly.xml 2 additions, 0 deletions

...Dis7Examples/Assemblies/dis7/SimpleServerDis7Assembly.xml
examples/src/ViskitOpenDis7Examples/lib/Networked_Graphics_MV3500_examples.jar 0 additions, 0 deletions

...enDis7Examples/lib/Networked_Graphics_MV3500_examples.jar
viskit/MyViskitProjects/DefaultProject/EventGraphs/examples/SimpleMachineFailure.xml 1 addition, 1 deletion

...aultProject/EventGraphs/examples/SimpleMachineFailure.xml
viskit/lib/viskit.jar 0 additions, 0 deletions

viskit/lib/viskit.jar

with 814 additions and 483 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment