Skip to content
Snippets Groups Projects
Commit 07aaafcf authored by drausch's avatar drausch
Browse files

Merge remote-tracking branch 'remotes/origin/develop' into feature/IMAGES_AND_VIEWPORTS 

# Conflicts:
#	VistaCoreLibs/VistaAspects/VistaAspectsMain.cpp
#	VistaCoreLibs/VistaAspects/_SourceFiles.cmake
#	VistaCoreLibs/VistaDeviceDrivers/VistaDepthSenseDriver/VistaDepthSenseDriver.cpp
#	VistaCoreLibs/VistaDeviceDrivers/VistaDepthSenseDriver/VistaDepthSenseDriver.h
#	VistaCoreLibs/VistaDeviceDrivers/VistaDepthSenseDriver/VistaDepthSensePlugin.cpp
#	VistaCoreLibs/VistaDeviceDrivers/VistaDepthSenseDriver/VistaDepthSenseTranscoder.cpp
#	VistaCoreLibs/VistaDeviceDrivers/VistaWiimoteDriver/VistaWiimoteCommonShare.h
#	VistaCoreLibs/VistaDeviceDriversBase/VistaDriverMain.cpp
#	VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionPulsed.cpp
#	VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionPulsed.h
#	VistaCoreLibs/VistaKernel/GraphicsManager/_SourceFiles.cmake
parents 331ad874 88bd0315
No related branches found
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 1796 additions and 77 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment