Clément Brisset a41ef94f5c Merge pull request #4137 from ctrlaltdavid/null-dereference ... Guard against derefencing NULL		2015-01-20 11:31:04 -08:00
..
external	Merge branch 'master' of https://github.com/highfidelity/hifi into 20216	2015-01-15 02:28:31 +01:00
resources	That was not the shader change I wanted to check in. This was.	2015-01-19 17:15:58 -08:00
src	Merge pull request #4137 from ctrlaltdavid/null-dereference	2015-01-20 11:31:04 -08:00
ui	changed "Load Scripts" label to be better understandable	2015-01-13 01:09:28 +01:00
CMakeLists.txt	Merge branch 'master' of https://github.com/highfidelity/hifi into 20216	2015-01-15 02:28:31 +01: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