Commit Graph

3 Commits

Author SHA1 Message Date
ori agranat
eb65156548 merge bugfix 2019-10-07 21:15:17 +03:00
Banks Troutman
61b09f2bf3 Merge branch 'networkmanager' into dev
# Conflicts:
#	Main/src/main/java/com/chameleonvision/util/MathHandler.java
#	Main/src/main/java/com/chameleonvision/vision/camera/Camera.java
#	Main/src/main/java/com/chameleonvision/vision/camera/CameraManager.java
#	Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java
2019-10-07 14:08:01 -04:00
Banks Troutman
3db2f30ea7 Continued rework of networking, added root check 2019-10-06 17:26:17 -04:00