overte-HifiExperiments/libraries/shared
Andrew Meadows fff7a36b54 merge upstream/master into physics project
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/avatar/Hand.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/avatar/SkeletonModel.h
	interface/src/renderer/Model.h
2014-03-25 15:55:26 -07:00
..
external move shared to libraries, DRY library macro, rename libs 2013-04-12 12:38:34 -07:00
src merge upstream/master into physics project 2014-03-25 15:55:26 -07:00
CMakeLists.txt Improved the adherence to code conventions after a code review. 2014-03-12 01:24:30 +02:00