1. 19 May, 2022 2 commits
  2. 18 May, 2022 1 commit
  3. 12 May, 2022 1 commit
  4. 18 Jan, 2022 1 commit
  5. 17 Dec, 2021 1 commit
  6. 02 Dec, 2021 2 commits
  7. 05 May, 2020 1 commit
  8. 24 Apr, 2020 1 commit
  9. 23 Apr, 2020 2 commits
  10. 22 Apr, 2020 1 commit
  11. 20 Apr, 2020 1 commit
  12. 17 Apr, 2020 1 commit
  13. 16 Apr, 2020 3 commits
  14. 14 Apr, 2020 1 commit
  15. 09 Apr, 2020 2 commits
  16. 08 Apr, 2020 1 commit
  17. 03 Apr, 2020 1 commit
    • Locatelli's avatar
      Merge remote-tracking branch 'origin/V3.2_191' into ploty2 · 9e463c4a
      Locatelli authored
      Conflicts:
      	src/controllers/lss/d22special/gui/nomadd22specialgui.jar
      	src/controllers/remotedielectricswindeta/DielectricsRemoteWindeta.cpp
      	src/controllers/remotenanokin/RemoteNanokin.cpp
      	src/controllers/remotenanokin/RemoteNanokin.h
      	src/controllers/vexp/VEXPController.cpp
      	src/drivers/caen/caen_cfd2/RealCAENCfd2Driver.cpp
      	src/drivers/gigecam/photonics/CameraHandler.cpp
      	src/drivers/gigecam/photonics/CameraHandler.h
      	src/drivers/gigecam/photonics/RealPhotonicsDriver.cpp
      	src/drivers/gigecam/photonics/RealPhotonicsDriver.h
      9e463c4a
  18. 02 Apr, 2020 1 commit
  19. 30 Mar, 2020 1 commit
  20. 17 Mar, 2020 1 commit
  21. 13 Mar, 2020 2 commits
  22. 10 Mar, 2020 1 commit
  23. 09 Mar, 2020 2 commits
  24. 05 Mar, 2020 3 commits
  25. 25 Feb, 2020 1 commit
  26. 21 Feb, 2020 3 commits
  27. 14 Feb, 2020 2 commits