Ryan Huffman 42bab84990 Merge branch 'master' of github.com:highfidelity/hifi into billboard-update ... Conflicts: interface/src/ui/overlays/BillboardOverlay.cpp		2015-01-30 16:58:05 -08:00
..
external	Merge branch 'master' of https://github.com/highfidelity/hifi into 20216	2015-01-15 02:28:31 +01:00
icon	fix check for debug/release icon	2015-01-30 15:41:44 -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 github.com:highfidelity/hifi into billboard-update	2015-01-30 16:58:05 -08:00
ui	Update runningScriptsWidgets px -> pt	2015-01-22 16:22:36 -08:00
CMakeLists.txt	fix check for debug/release icon	2015-01-30 15:41:44 -08:00
interface_en.ts	remove more references to voxels	2015-01-07 16:09:56 -08:00
InterfaceConfig.h.in
InterfaceVersion.h.in