Stephen Birarda 636d12510c Merge branch 'master' of https://github.com/highfidelity/hifi		2014-03-06 14:45:02 -08:00
..
external	tweak the oculus find module to take copied-in folders	2014-03-06 14:16:38 -08:00
resources	resolve conflicts on merge with upstream master	2014-02-21 15:16:15 -08:00
src	include cstdio for snprintf call in BandwidthDialog	2014-03-06 13:31:08 -08:00
ui
CMakeLists.txt	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-03-06 14:45:02 -08:00
interface.icns
InterfaceConfig.h.in
InterfaceVersion.h.in