Clément Brisset efc5e5d52b Merge pull request #4684 from ctrlaltdavid/dde-fps ... Log DDE FPS after a reset		2015-04-24 14:28:26 +02: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	Enable resizable dialogs	2015-04-17 17:43:54 -07:00
src	Merge pull request #4684 from ctrlaltdavid/dde-fps	2015-04-24 14:28:26 +02:00
ui	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI	2015-04-14 13:13:15 -07:00
CMakeLists.txt	Merge remote-tracking branch 'upstream/master' into offscreen	2015-04-21 13:02:38 -07:00
interface_en.ts	remove more references to voxels	2015-01-07 16:09:56 -08:00
InterfaceConfig.h.in
InterfaceVersion.h.in