Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-20 00:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
1e4354763581a5d7f842420ff82b45af94b2a4db
PhotonVision/Main/src/main/java/com/chameleonvision/settings
History
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
..
GeneralSettings.java
finished integration between new client and backend
2019-10-16 14:13:12 +03:00
Platform.java
Revert "Merge branch 'speckle-rejection' into 'ui-integration'"
2019-10-23 23:03:32 +00:00
SettingsManager.java
Merge remote-tracking branch 'origin/dev' into ui-integration
2019-10-24 02:12:04 +03:00