1. 02 Dec, 2020 1 commit
  2. 25 Nov, 2020 1 commit
  3. 12 Nov, 2020 1 commit
  4. 10 Nov, 2020 1 commit
  5. 02 Nov, 2020 1 commit
  6. 27 Oct, 2020 1 commit
  7. 18 Oct, 2020 2 commits
  8. 14 Oct, 2020 6 commits
  9. 08 Oct, 2020 1 commit
  10. 11 Sep, 2020 2 commits
  11. 04 Sep, 2020 4 commits
  12. 25 Aug, 2020 2 commits
  13. 24 Aug, 2020 1 commit
    • Dmitri Fix's avatar
      Merge remote-tracking branch 'remotes/origin/itk' into hlrs · 82aeaf90
      Dmitri Fix authored
      # Conflicts (solved by taking "itk" branch):
      #	OpenPass_Source_Code/openPASS_GUI/CMakeLists.txt
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-AgentConfiguration/CMakeLists.txt
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-AgentConfiguration/Views/DelegateComboBoxView.cpp
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-AgentConfiguration/Views/DelegateComboBoxView.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-AgentConfiguration/Views/DelegateDoubleView.cpp
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-AgentConfiguration/Views/DelegateDoubleView.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-Component/CMakeLists.txt
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-Project/CMakeLists.txt
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-Project/Models/ProjectModel.cpp
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-System/CMakeLists.txt
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-System/Models/SystemModel.cpp
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-System/Views/SystemComponentManagerView.cpp
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/CMakeLists.txt
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Interfaces/openPASS-TrafficSimulation/EnvironmentInterface.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Interfaces/openPASS-TrafficSimulation/TrafficInterface.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Models/EnvironmentItemModel.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Models/EnvironmentModel.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Models/ExperimentModel.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Models/ScenarioModel.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Models/TrafficItemMapModel.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Models/TrafficItemModel.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Models/TrafficModel.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Models/TrafficSimulationModel.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Models/TrafficSimulationXMLLoadModel.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Models/TrafficSimulationXMLSaveModel.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/EnvironmentDisplayPresenter.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/EnvironmentMapPresenter.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/EnvironmentPresenter.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/ExperimentPresenter.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/LibrariesPresenter.cpp
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/LibrariesPresenter.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/LoggingGroupsPresenter.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/ScenarioAgentsPresenter.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/ScenarioDisplayPresenter.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/ScenarioPresenter.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/TrafficDisplayPresenter.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/TrafficItemMapPresenter.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/TrafficPresenter.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/TrafficSimulationPresenter.cpp
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Presenters/TrafficSimulationPresenter.h
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Views/EnvironmentItemView.cpp
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Views/TrafficItemView.cpp
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-TrafficSimulation/Views/TrafficVolumeView.cpp
      #	OpenPass_Source_Code/openPASS_GUI/openPASS-Window/CMakeLists.txt
      #	OpenPass_Source_Code/openPASS_GUI/openPASS/CMakeLists.txt
      #	OpenPass_Source_Code/openPASS_GUI/openPASS/openPASS.rc
      82aeaf90
  14. 05 Aug, 2020 4 commits
  15. 02 Jun, 2020 2 commits
    • Reinhard Biegel's avatar
      Merge branch 'cmake' into servant · 81e8850a
      Reinhard Biegel authored
      Change-Id: I4d930b9f036a326fab854f01fe363a6d2d49b7fc
      81e8850a
    • Reinhard Biegel's avatar
      minor fixes for cmake · ffe7eb36
      Reinhard Biegel authored
      - GMock detection workaround
      - comment out unit test reference (as the cmake files are still missing)
      - path typo
      - drop iss installer (for now)
      
      Change-Id: Ib698a15a280c95ac2b0b9894d00fb7da90ef7a32
      ffe7eb36
  16. 20 May, 2020 1 commit
  17. 14 May, 2020 2 commits
  18. 25 Apr, 2020 4 commits
  19. 17 Apr, 2020 1 commit
  20. 31 Mar, 2020 1 commit
  21. 21 Mar, 2020 1 commit