ori agranat e1f908e0a1 Merge remote-tracking branch 'origin/dev' into ui-integration ...

# Conflicts:
#	Main/src/main/java/com/chameleonvision/network/NetworkManager.java
#	Main/src/main/java/com/chameleonvision/vision/process/CVProcess.java
#	Main/src/main/java/com/chameleonvision/vision/process/PipelineResult.java
#	Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java
#	Main/src/main/java/com/chameleonvision/web/ServerHandler.java

2019-10-24 02:12:04 +03:00

9.3 KiB

Raw Blame History

View Raw