Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-13 05:35:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-JulianGro/libraries/gpu
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/gpu Merge remote-tracking branch 'upstream/master' into plugins 2015-07-30 12:55:22 -07:00
CMakeLists.txt Trying to fixup the plugins compilation 2015-07-02 00:00:00 -07:00