Andrzej Kapolka e866c22518 Merge branch 'master' of https://github.com/worklist/hifi into kinected ... Conflicts: interface/src/Avatar.cpp		2013-07-03 10:15:11 -07:00
..
src	Merge branch 'master' of https://github.com/worklist/hifi into kinected	2013-07-03 10:15:11 -07:00
CMakeLists.txt	fixed build issue	2013-06-04 17:40:34 -07:00