Merge branch 'bfgminer-2.5.x' into bfgminer

Conflicts:
	NEWS
	configure.ac

NEWS

@@ -80,6 +80,13 @@ manageable for now.
 with the --scrypt option.
 - Enable completely compiling scrypt out.
 - Begin import of scrypt opencl kernel from reaper.
+
+
+BFGMiner Version 2.5.3 - July 29, 2012
+
+- Bugfix: Add zlib1.dll to Win32 release archive
+- Bugfix: SICK low-hashrate is now determined by being under 1/3 the runtime
+average hashrate
 - Bugfix: cpu_set_t is never #defined, so use CPU_ZERO which is a macro
 
 

make-release

@@ -19,6 +19,7 @@ cp -v \
 	libcurl-4.dll \
 	pthreadGC2.dll \
 	libusb-1.0.dll \
+	zlib1.dll \
 	"$OUTDIR/"
 git branch TMP "$tag"
 git clone . "$TMPDIR" -b TMP --depth 1

miner.c

@@ -5059,7 +5059,7 @@ static void *watchdog_thread(void __maybe_unused *userdata)
 			if (!strcmp(cgpu->api->dname, "cpu"))
 				continue;
 #endif
-			if (cgpu->rolling < WATCHDOG_LOW_HASH)
+			if (max(WATCHDOG_LOW_HASH, cgpu->rolling) < cgpu->total_mhashes / total_secs / 3)
 				cgpu->low_count++;
 			else
 				cgpu->low_count = 0;