Banks Troutman 33c35cda86 Merge remote-tracking branch 'origin/Java' into Java ...

# Conflicts:
#	Main/src/main/java/com/chameleonvision/vision/process/CVProcess.java

2019-09-22 02:51:44 -04:00

..

src/main

Merge remote-tracking branch 'origin/Java' into Java

2019-09-22 02:51:44 -04:00

target/classes/web

new client upload

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

chameleon-vision.iml

Revert "Revert "Added network settings handler for linux""

2019-09-21 18:38:08 +03:00

pom.xml

Update pom.xml to build uberjar

2019-09-21 19:50:18 -04:00