overte-HifiExperiments/libraries/avatars
David Rowe e6473fc8b9 Merge branch 'master' into 20639
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Menu.h
	tests/ui/src/main.cpp
2015-08-11 12:34:28 -07:00
..
src Merge branch 'master' into 20639 2015-08-11 12:34:28 -07:00
CMakeLists.txt remove use of include_dependency_includes and use cmake 2015-02-18 14:12:05 -08:00