Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-10 17:59:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/interface
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
..
external Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-03 09:25:03 -07:00
resources Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-02 13:12:37 -07:00
src Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities 2014-07-03 14:20:40 -07:00
ui Merge pull request #3108 from huffman/19800 2014-07-02 15:46:56 -07:00
CMakeLists.txt Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities 2014-07-03 14:20:40 -07:00
interface.icns
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in