Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-17 19:26:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/libraries/render-utils
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
..
res/fonts move fonts to sdff files, load with qrc 2015-02-06 11:48:55 -08:00
src Merge remote-tracking branch 'upstream/master' into plugins 2015-07-30 12:55:22 -07:00
CMakeLists.txt Merge remote-tracking branch 'upstream/master' into plugins 2015-07-20 19:21:02 -07:00