ZappoMan 49c4075277 Merge branch 'master' of https://github.com/worklist/hifi into multi_VS_assigments		2013-09-17 16:00:32 -07:00
..
external/civetweb	replace mongoose webserver with MIT licensed civetweb	2013-09-16 12:47:38 -07:00
resources/web	add the ability to ask for multiple instances from JS page	2013-09-17 11:48:08 -07:00
src	Merge branch 'master' of https://github.com/worklist/hifi into multi_VS_assigments	2013-09-17 16:00:32 -07:00
CMakeLists.txt	link platform appropriate dl libraries on UNIX for civetweb	2013-09-17 09:30:40 -07:00