overte-HifiExperiments/libraries/shared
Andrew Meadows 7ba5bc71ea Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes
Conflicts:
	interface/src/renderer/FBXReader.cpp
	interface/src/renderer/Model.cpp
	interface/src/renderer/Model.h
2014-03-04 09:01:24 -08:00
..
external move shared to libraries, DRY library macro, rename libs 2013-04-12 12:38:34 -07:00
src Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes 2014-03-04 09:01:24 -08:00
CMakeLists.txt remove the starfield URL loading code, closes #1497 2014-01-10 15:33:43 -08:00