Ryan Huffman f698f3375a Update resource urls for chat window close button		2014-04-14 11:34:27 -07:00
..
external	More work on Faceplus integration.	2014-04-09 11:54:55 -07:00
resources	Merge remote-tracking branch 'upstream/master' into 19554	2014-04-14 11:20:49 -07:00
src	Merge remote-tracking branch 'upstream/master' into 19554	2014-04-14 11:20:49 -07:00
ui	Update resource urls for chat window close button	2014-04-14 11:34:27 -07:00
CMakeLists.txt	Merge pull request #2637 from birarda/authentication	2014-04-14 10:24:17 -07:00
interface.icns	update to newer interface icon	2013-05-15 14:43:35 -07:00
interface_en.ts	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-04-03 11:37:27 -07:00
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