overte-lubosz/libraries/shared
tosh 1e6352593a Merge branch 'master' of git://github.com/worklist/hifi into 19262
Conflicts:
	interface/src/Head.cpp
	interface/src/Util.cpp
	interface/src/main.cpp
	libraries/avatars/src/Orientation.cpp
2013-04-18 12:38:35 +02:00
..
external move shared to libraries, DRY library macro, rename libs 2013-04-12 12:38:34 -07:00
src Merge branch 'master' of git://github.com/worklist/hifi into 19262 2013-04-18 12:38:35 +02:00
CMakeLists.txt move shared to libraries, DRY library macro, rename libs 2013-04-12 12:38:34 -07:00