Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-22 23:34:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/interface
History
ZappoMan 3a8c5018ee Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	interface/src/Application.h
	libraries/entities/src/EntityTreeElement.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTree.h
	libraries/models/src/ModelTreeElement.cpp
	libraries/networking/src/PacketHeaders.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
2014-08-04 12:01:23 -07:00
..
external add a note for OS X users to use homebrew 2014-07-18 15:39:21 -07:00
resources Hide the unset (black) bits. 2014-07-30 18:14:11 -07:00
src Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-04 12:01:23 -07:00
ui maxFramesOverDesired added; settable from domain page and preferences 2014-07-29 15:57:32 -07:00
CMakeLists.txt Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-07-31 10:34:23 -07:00
interface.icns update the interface icon 2014-07-07 11:46:57 -07:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in