Stephen Birarda 05dde9d8f5 resolve conflicts on merge with upstream/master		2015-07-15 16:18:47 -07:00
..
external	remove visage related files	2015-04-17 13:40:31 -07:00
icon
resources	Tweak button positions	2015-07-09 10:15:28 -07:00
src	resolve conflicts on merge with upstream/master	2015-07-15 16:18:47 -07:00
ui	Avatar collision sounds.	2015-06-26 16:23:16 -07:00
CMakeLists.txt	cleanup some warnings	2015-07-15 11:20:55 -07:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in