Philip Rosedale d7cc76e48b Merge pull request #4735 from jherico/menu_fix ... Prevent the menu from coming up when alt is applied as a modifier to touch or mouse events		2015-05-02 00:35:49 -07:00
..
external	remove visage related files	2015-04-17 13:40:31 -07:00
icon	fix check for debug/release icon	2015-01-30 15:41:44 -08:00
resources	don't save default values in json file	2015-04-30 11:28:27 -07:00
src	Merge pull request #4735 from jherico/menu_fix	2015-05-02 00:35:49 -07:00
ui	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI	2015-04-14 13:13:15 -07:00
CMakeLists.txt	add a macro to recursively correctly handle resources	2015-04-27 16:02:52 -07:00
interface_en.ts	remove more references to voxels	2015-01-07 16:09:56 -08:00
InterfaceConfig.h.in
InterfaceVersion.h.in