Brad Hefta-Gaub f3fb39574f Merge pull request #3007 from wangyix/master ... Added Developer menu option to disable nack packets.		2014-06-09 18:11:01 -07:00
..
external	Better instructions.	2014-05-12 17:55:07 -07:00
resources	Merge branch 'master' of https://github.com/highfidelity/hifi into cascade	2014-05-29 17:09:09 -07:00
src	Merge pull request #3007 from wangyix/master	2014-06-09 18:11:01 -07:00
ui	Merge branch master of upstream	2014-05-29 22:31:32 +05:30
CMakeLists.txt	put back ssize_t definition	2014-05-20 11:56:06 -07:00
interface.icns
interface_en.ts	Merge branch master	2014-04-24 18:52:59 +05:30
InterfaceConfig.h.in
InterfaceVersion.h.in