Stephen Birarda f765ef4385 Merge branch 'master' of github.com:worklist/hifi into ds-admin		2013-10-23 10:27:24 -07:00
..
resources/web	add bootstrap to DS, stub fulfilled and queued assignments on index page	2013-10-22 17:38:14 -07:00
src	use char array of static length for pool	2013-10-22 13:35:26 -07:00
CMakeLists.txt	remove dependency on cJSON and use Qt instead	2013-10-15 15:29:51 -07:00