overte-HifiExperiments/interface
ZappoMan 0e501f4439 Merge branch 'master' of https://github.com/worklist/hifi into compressed_packets
Conflicts:
	interface/src/Menu.cpp
	interface/src/Menu.h
2013-11-27 15:44:51 -08:00
..
external Path fix for readme. 2013-11-18 12:34:38 -08:00
resources Merge branch 'master' of https://github.com/worklist/hifi into compressed_packets 2013-11-27 15:44:51 -08:00
src Merge branch 'master' of https://github.com/worklist/hifi into compressed_packets 2013-11-27 15:44:51 -08:00
CMakeLists.txt Optional compilation for Sixense. 2013-11-18 12:09:52 -08:00
interface.icns
InterfaceConfig.h.in