Brad Hefta-Gaub 1cd699de9d Merge pull request #5657 from birarda/master ... fix for 0 entity avg ping		2015-08-25 22:27:44 -07:00
..
external	Merge branch 'master' into 20639	2015-08-05 16:49:06 -07:00
icon
resources	show how many times per second Application::idle is called	2015-08-18 01:41:17 -07:00
src	Merge pull request #5657 from birarda/master	2015-08-25 22:27:44 -07:00
ui	apperance => appearance	2015-08-13 14:42:37 -07:00
CMakeLists.txt	Merge branch 'master' of https://github.com/worklist/hifi into 20638	2015-08-21 19:29:38 +02:00
interface_da.ts	shell for Danish translation of Interface	2015-08-17 12:53:57 +02:00
interface_en.ts