overte/libraries/avatars
Andrew Meadows 47e340dafe Merge upstream/master
Conflicts:
	interface/src/avatar/MyAvatar.cpp
2014-03-07 09:16:33 -08:00
..
src Merge upstream/master 2014-03-07 09:16:33 -08:00
CMakeLists.txt replace deprecated qt5 macros in cmake with target_link_libraries 2014-03-04 12:41:24 -08:00