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

..

src/main

Merge branch 'networkmanager' into dev

2019-10-07 14:08:01 -04:00

target/classes/web

new client upload

2019-09-20 09:34:13 -07:00

chameleon-vision.iml

Continued rework of networking, added root check

2019-10-06 17:26:17 -04:00

pom.xml

Update WPILib dependencies

2019-10-07 14:04:20 -04:00