Brad Hefta-Gaub 90a84d4241 Merge pull request #2866 from talentraspel/19661 ... yep - this fixes the issue.		2014-05-16 09:20:26 -07:00
..
external	Better instructions.	2014-05-12 17:55:07 -07:00
resources	changed	2014-05-16 15:44:07 +02:00
src	Merge pull request #2865 from talentraspel/19662	2014-05-16 08:59:31 -07:00
ui	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-05-12 19:42:44 +02:00
CMakeLists.txt	Merge pull request #2856 from ZappoMan/modelserver	2014-05-14 15:03:49 -07:00
interface.icns
interface_en.ts	Merge branch master	2014-04-24 18:52:59 +05:30
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