Stephen Birarda 74a0b8a7b5 resolve conflicts on merge with upstream master		2013-09-17 11:50:30 -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	resolve conflicts on merge with upstream master	2013-09-17 11:50:30 -07:00
CMakeLists.txt	link platform appropriate dl libraries on UNIX for civetweb	2013-09-17 09:30:40 -07:00