Browse Source

Null-Merge commit '176747f' into cg_merges_20131108a

Conflicts:
	NEWS
	configure.ac
	driver-avalon.c
	driver-avalon.h
	driver-icarus.c
	miner.c
	usbutils.c
Luke Dashjr 12 years ago
parent
commit
c9ddc8ad97

Diff Data Not Available.