Philip Rosedale 3b2b075414 Merge pull request #2640 from birarda/kill-scope ... remove the audio scope		2014-04-09 22:11:02 -07:00
..
external	slightly different approach to windows warning fix	2014-03-15 21:30:45 -07:00
resources	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-09 15:10:48 -07:00
src	Merge pull request #2640 from birarda/kill-scope	2014-04-09 22:11:02 -07:00
ui	Manual merge	2014-04-02 18:07:55 -07:00
CMakeLists.txt	Don't refer to the QM file.	2014-04-03 11:42:43 -07:00
interface.icns
InterfaceConfig.h.in	missed copyright cleanups in apache header	2014-04-09 09:44:38 -07:00
InterfaceVersion.h.in	missed copyright cleanups in apache header	2014-04-09 09:44:38 -07:00