Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-28 09:30:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/domain-server
History
ZappoMan ec0c350f60 Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities 
Conflicts:
	interface/src/Application.cpp
	interface/src/DatagramProcessor.cpp
	libraries/script-engine/src/ScriptEngine.cpp
2014-07-03 14:20:40 -07:00
..
resources/web add querying for settings that affect a specific type 2014-06-26 16:29:44 -07:00
src Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities 2014-07-03 14:20:40 -07:00
CMakeLists.txt populate the settings page correctly with existing values 2014-06-25 13:55:32 -07:00