Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-04 11:00:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
overte/libraries/shared
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
..
src Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-28 13:38:22 -07:00
CMakeLists.txt Cleanup CMake files 2015-10-11 00:01:03 -07:00