overte/libraries/entities-renderer
Andrew Meadows 2f749e3c51 merge upstream/master into andrew/isentropic
Conflicts:
	libraries/entities/src/TextEntityItem.h
2015-02-25 14:40:32 -08:00
..
src merge upstream/master into andrew/isentropic 2015-02-25 14:40:32 -08:00
CMakeLists.txt remove use of include_dependency_includes and use cmake 2015-02-18 14:12:05 -08:00