Ryan Huffman a552d48401 Merge remote-tracking branch 'upstream/master' into 19554-2		2014-04-17 20:02:05 -07:00
..
external	More work on Faceplus integration.	2014-04-09 11:54:55 -07:00
resources	Add emoticons to chat	2014-04-17 19:51:25 -07:00
src	Merge remote-tracking branch 'upstream/master' into 19554-2	2014-04-17 20:02:05 -07:00
ui	Disallow rich text from being pasted into the chat area	2014-04-17 14:02:21 -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	first cut at new version of audio refelctor	2014-04-13 19:11:25 -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