Brad Hefta-Gaub bd6e30070d Merge branch 'master' of git://github.com/worklist/hifi into windows_build ... Conflicts: libraries/shared/src/NodeList.cpp libraries/shared/src/NodeList.h		2014-01-15 13:18:25 -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 git://github.com/worklist/hifi into windows_build	2014-01-15 13:18:25 -08:00
CMakeLists.txt	remove the starfield URL loading code, closes #1497	2014-01-10 15:33:43 -08:00