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