Atlante45 4562c29be8 Merge branch 'master' of https://github.com/highfidelity/hifi into android ... Conflicts: interface/src/avatar/Hand.cpp		2015-01-30 12:02:11 -08:00
..
external	handle gverb move to audio-client	2015-01-29 12:44:03 -08:00
resources	Fix for misaligned color/material textures when resolution is greater than the	2015-01-20 13:07:35 -08:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into android	2015-01-30 12:02:11 -08:00
ui	Update runningScriptsWidgets px -> pt	2015-01-22 16:22:36 -08:00
CMakeLists.txt	set size of GVRMainWindow to note 4 size	2015-01-29 10:11:46 -08:00
interface.icns
interface_en.ts	remove more references to voxels	2015-01-07 16:09:56 -08:00
InterfaceConfig.h.in
InterfaceVersion.h.in