Ryan Huffman 5c9473cd24 Merge branch 'master' of github.com:highfidelity/hifi into update-light-entity-properties ... Conflicts: libraries/entities-renderer/src/RenderableLightEntityItem.cpp		2015-02-27 12:20:10 -08:00
..
src	Merge branch 'master' of github.com:highfidelity/hifi into update-light-entity-properties	2015-02-27 12:20:10 -08:00
CMakeLists.txt	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00