Skip to content
Snippets Groups Projects
Select Git revision
  • master default
  • python
  • forHU
  • snapshot_20210303
  • WorkingHauke
  • BioTracker3_View+
  • BioTracker3_publication
  • BioTracker3_Serialization
  • Biotracker3_GenericSerialization
  • AreadescriptorToCore protected
  • BioTracker3
  • BioTracker3_DevHauke
  • origin/BioTracker3WindowsFix
  • fix_windows_compiling
  • andi
  • load_save_tracked_data
  • load_media_on_open
  • fix_windows_build
  • live_video
  • opencv3
  • 3.3.0
  • 3.2.1
  • v3.1.0
  • v3.0.19
  • v3.0.14
25 results
Blame Permalink
  • Hauke Jürgen Mönck's avatar
    b0813c46
    Merge remote-tracking branch 'remotes/origin/BioTracker3' into BioTracker3WindowsFix · b0813c46
    Hauke Jürgen Mönck authored 
    # Conflicts:
#	BioTracker/CoreApp/BioTracker/BioTracker.pro
#	BioTracker/CoreApp/BioTracker/Controller/ControllerMainWindow.cpp
#	BioTracker/CoreApp/BioTracker/Controller/ControllerMainWindow.h
#	BioTracker/CoreApp/BioTracker/Controller/ControllerPlayer.cpp
#	BioTracker/CoreApp/BioTracker/Controller/ControllerPlugin.cpp
#	BioTracker/CoreApp/BioTracker/Controller/ControllerTextureObject.cpp
#	BioTracker/CoreApp/BioTracker/Model/MediaPlayer.cpp
#	BioTracker/CoreApp/BioTracker/Model/MediaPlayerStateMachine/PlayerStates/PStatePlay.cpp
#	BioTracker/CoreApp/BioTracker/View/MainWindow.cpp
#	BioTracker/CoreApp/BioTracker/View/MainWindow.h
#	BioTracker/Interfaces/BioTrackerInterfaces/Interfaces/IModel/IObject.h
#	BioTracker/Plugin/BioTrackerPlugin/BioTrackerPlugin.cpp
#	BioTracker/Plugin/BioTrackerPlugin/BioTrackerPlugin.h
    b0813c46
    History
    Merge remote-tracking branch 'remotes/origin/BioTracker3' into BioTracker3WindowsFix
    Hauke Jürgen Mönck authored 
    # Conflicts:
#	BioTracker/CoreApp/BioTracker/BioTracker.pro
#	BioTracker/CoreApp/BioTracker/Controller/ControllerMainWindow.cpp
#	BioTracker/CoreApp/BioTracker/Controller/ControllerMainWindow.h
#	BioTracker/CoreApp/BioTracker/Controller/ControllerPlayer.cpp
#	BioTracker/CoreApp/BioTracker/Controller/ControllerPlugin.cpp
#	BioTracker/CoreApp/BioTracker/Controller/ControllerTextureObject.cpp
#	BioTracker/CoreApp/BioTracker/Model/MediaPlayer.cpp
#	BioTracker/CoreApp/BioTracker/Model/MediaPlayerStateMachine/PlayerStates/PStatePlay.cpp
#	BioTracker/CoreApp/BioTracker/View/MainWindow.cpp
#	BioTracker/CoreApp/BioTracker/View/MainWindow.h
#	BioTracker/Interfaces/BioTrackerInterfaces/Interfaces/IModel/IObject.h
#	BioTracker/Plugin/BioTrackerPlugin/BioTrackerPlugin.cpp
#	BioTracker/Plugin/BioTrackerPlugin/BioTrackerPlugin.h
Code owners
Assign users and groups as approvers for specific file changes. Learn more.