[Pkg-bitcoin-commits] [cgminer] 03/05: Merge tag 'upstream/4.7.0'

[Scott Sheridan Howard]

This is an automated email from the git hooks/post-receive script.

showard pushed a commit to branch master
in repository cgminer.

commit 5168f1eb2faeb121af35084b121eeefbe838aaac
Merge: 6ab4556 cb13179
Author: Scott Howard <showard314 at gmail.com>
Date:   Sun Oct 26 10:09:39 2014 -0400

    Merge tag 'upstream/4.7.0'
    
    Upstream version 4.7.0
    
    Conflicts:
    	.gitignore

 .gitignore                |  47 +++++
 01-cgminer.rules          |   1 +
 API-README                |  20 +-
 ASIC-README               |  16 ++
 Makefile.am               |   4 +
 NEWS                      |  41 ++++
 README                    |   5 +
 api.c                     | 290 ++++++++++++++++++---------
 cgminer.c                 |  26 ++-
 configure.ac              |  26 ++-
 driver-avalon2.c          |  25 +--
 driver-blockerupter.c     | 501 ++++++++++++++++++++++++++++++++++++++++++++++
 driver-blockerupter.h     | 130 ++++++++++++
 driver-hashratio.c        |   6 +-
 driver-icarus.c           |   7 +-
 driver-spondoolies-sp30.c |  13 +-
 miner.h                   |   7 +
 usbutils.c                |  51 +++++
 usbutils.h                |  12 +-
 util.c                    | 179 ++++++++++++++++-
 util.h                    |   4 +
 21 files changed, 1270 insertions(+), 141 deletions(-)

diff --cc .gitignore
index 845ca06,a7ba28f..e7c332e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,47 +1,48 @@@
 +.pc
+ cgminer
+ cgminer.exe
+ minerd
+ minerd.exe
+ *.o
+ *.bin
+ 
+ autom4te.cache
+ .deps
+ 
+ Makefile
+ Makefile.in
+ INSTALL
+ aclocal.m4
+ configure
+ depcomp
+ missing
+ install-sh
+ stamp-h1
+ cpuminer-config.h*
+ compile
+ config.log
+ config.status
+ config.guess
+ config.sub
+ 
+ mingw32-config.cache
+ 
+ *~
+ 
+ ext_deps
+ config.h.in
+ config.h
+ 
+ 
+ ccan/libccan.a
+ lib/arg-nonnull.h
+ lib/c++defs.h
+ lib/libgnu.a
+ lib/signal.h
+ lib/string.h
+ lib/stdint.h
+ lib/warn-on-use.h
+ 
+ mkinstalldirs
+ 
+ *.swp

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/cgminer.git