Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 01:03:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/assignment-client
History
ZappoMan 77e1867b11 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/src/Agent.cpp
	assignment-client/src/Agent.h
	examples/editModels.js
	interface/src/Application.h
2014-07-31 10:34:23 -07:00
..
src Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-07-31 10:34:23 -07:00
CMakeLists.txt Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-07-31 10:34:23 -07:00