Andrew Meadows 67c3a25475 Merge branch 'master' of ssh://github.com/highfidelity/hifi into inertia ... Conflicts: interface/src/Application.cpp libraries/entities/src/EntityItem.h		2014-12-15 14:46:46 -08:00
..
src	fix ray picking output distance to be meters	2014-12-10 11:04:32 -08:00
CMakeLists.txt	moving Shape* back into shared lib	2014-12-01 16:03:14 -08:00