Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 01:43:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/interface
History
Brad Davis 3c1a0930da Merge remote-tracking branch 'upstream/master' into HEAD 
Conflicts:
	interface/src/avatar/MyAvatar.h
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
2015-10-28 13:38:22 -07:00
..
external Update readme.txt 2015-09-15 00:29:12 +02:00
i18n Updated english translation file 2015-10-15 11:15:06 -07:00
icon
resources Fixed standard.json 2015-10-27 11:35:30 -07:00
src Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-28 13:38:22 -07:00
ui ScriptEditor Improvements: 2015-10-14 20:37:47 +02:00
CMakeLists.txt Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-28 13:38:22 -07:00