Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-12 14:34:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/libraries/render-utils
History
Brad Davis 031b294ae5 Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Camera.cpp
	interface/src/Camera.h
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/ApplicationOverlay.h
	libraries/render-utils/src/GlowEffect.cpp
	libraries/render-utils/src/GlowEffect.h
	libraries/render-utils/src/TextureCache.cpp
2015-04-30 12:14:07 -07:00
..
res/fonts move fonts to sdff files, load with qrc 2015-02-06 11:48:55 -08:00
src Merge branch 'master' into plugins 2015-04-30 12:14:07 -07:00
CMakeLists.txt Merge remote-tracking branch 'upstream/master' into offscreen 2015-04-21 13:02:38 -07:00