Stojce Slavkovski c5bceed880 Merge branch 'master' of https://github.com/worklist/hifi into 19597		2014-05-01 13:10:51 +02:00
..
external	More work on Faceplus integration.	2014-04-09 11:54:55 -07:00
resources	Merge branch 'master' of https://github.com/worklist/hifi into 19597	2014-05-01 01:41:11 +02:00
src	Merge branch 'master' of https://github.com/worklist/hifi into 19597	2014-05-01 13:10:51 +02:00
ui	Merge remote-tracking branch 'upstream/master' into RunningScripts	2014-04-29 16:28:36 -07:00
CMakeLists.txt	Moved FBX code to its own library so that we can use it for bots.	2014-04-14 17:15:58 -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