thodg/cgminer

2013-10-13T16:41:53

Merge branch 'master' into hashfast Conflicts: api.c configure.ac miner.h usbutils.c usbutils.h