Leonardo Murillo 8f72763f17 Merge branch 'master' of github.com:highfidelity/hifi into auto-updater		2015-06-10 13:18:20 -06: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	Conflict fixing	2015-06-08 15:00:06 -06:00
src	Merge branch 'master' of github.com:highfidelity/hifi into auto-updater	2015-06-10 13:18:20 -06:00
ui	Checkpoint auto updater	2015-06-02 19:32:03 -06:00
CMakeLists.txt	Merge branch 'master' of github.com:highfidelity/hifi into auto-updater	2015-06-09 09:01:50 -06:00
interface_en.ts	remove more references to voxels	2015-01-07 16:09:56 -08:00
InterfaceConfig.h.in
InterfaceVersion.h.in