Banks Troutman abeda8e531 Merge branch 'dev' of https://gitlab.com/chameleon-vision/Chameleon-Vision into dev ...

# Conflicts:
#	Main/src/main/java/com/chameleonvision/Main.java

2019-09-25 13:37:17 -04:00

..

src/main

Merge branch 'dev' of https://gitlab.com/chameleon-vision/Chameleon-Vision into dev

2019-09-25 13:37:17 -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

changed version number

2019-09-25 20:04:03 +03:00