Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-Armored-Dragon/interface
History
Brad Davis 85c80f3be8 Merge remote-tracking branch 'upstream/master' into smarter_textures 
Conflicts:
	libraries/gpu/src/gpu/Texture.cpp
2017-03-22 14:25:23 -07:00
..
external
i18n
icon
resources Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-22 14:25:23 -07:00
src Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-22 14:25:23 -07:00
ui Remove Edit > Scripts Editor and all related source files 2017-03-20 00:25:50 -04:00
CMakeLists.txt Merge remote-tracking branch 'upstream/master' into HEAD 2017-03-08 09:03:21 -08:00
interface.exe.manifest