Andrew Meadows c383b69b61 merge upstream/master into enforce-standard ... Conflicts: interface/src/avatar/Hand.cpp		2014-03-27 10:53:54 -07:00
..
external
src	merge upstream/master into enforce-standard	2014-03-27 10:53:54 -07:00
CMakeLists.txt	Improved the adherence to code conventions after a code review.	2014-03-12 01:24:30 +02:00