2 Commits

Author	SHA1	Message	Date
Banks Troutman	a0dddc0289	Merge branch 'dev' into class-abstraction ... # Conflicts: # .gitignore # Main/src/main/java/com/chameleonvision/vision/camera/Camera.java # Main/src/main/java/com/chameleonvision/vision/camera/CameraSerializer.java # Main/src/main/java/com/chameleonvision/vision/enums/StreamDivisor.java # Main/src/main/java/com/chameleonvision/vision/process/CameraProcess.java # Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java # Main/src/main/java/com/chameleonvision/web/Server.java # Main/src/main/java/com/chameleonvision/web/SocketHandler.java	2019-11-27 17:40:24 -05:00
ori agranat	1198e2cf99	general settings and camera settings as http requests	2019-11-09 19:52:33 +02:00