Merge remote-tracking branch 'origin/John's-Branch' into Maegans_Branch

Conflicts: src/jat/examples/ThreeBodyExample/ThreeBodyExample.java
mxd12001 · Dec 7, 2015 · fb1dec7 · fb1dec7
2 parents 4bdbee0 + 47dd6e6
commit fb1dec7
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 141 deletions.
diff --git a/src/jat/examples/ThreeBodyExample/ThreeBodyAPL.java b/src/jat/examples/ThreeBodyExample/ThreeBodyAPL.java
diff --git a/src/jat/examples/ThreeBodyExample/ThreeBodyExample.java b/src/jat/examples/ThreeBodyExample/ThreeBodyExample.java