Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 21:02:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
overte/libraries/render
History
Brad Davis f7a2513f26 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/MyAvatar.h
	tests/ui/src/main.cpp
2015-07-30 12:55:22 -07:00
..
src/render Merge remote-tracking branch 'upstream/master' into plugins 2015-07-30 12:55:22 -07:00
CMakeLists.txt Adding intrsumentation for nsight and hiding the nsight specific code in cpp 2015-07-08 14:25:13 -07:00