ZappoMan 9d87d58723 Merge branch 'master' of https://github.com/worklist/hifi into more_scripting ... Conflicts: libraries/particles/src/ParticlesScriptingInterface.cpp		2014-01-28 20:36:35 -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 https://github.com/worklist/hifi into more_scripting	2014-01-28 20:36:35 -08:00
CMakeLists.txt	remove the starfield URL loading code, closes #1497	2014-01-10 15:33:43 -08:00