[Pkg-bitcoin-commits] [cgminer] 03/05: Merge tag 'upstream/4.6.1'
Scott Sheridan Howard
showard at moszumanska.debian.org
Sun Oct 12 15:28:57 UTC 2014
This is an automated email from the git hooks/post-receive script.
showard pushed a commit to branch master
in repository cgminer.
commit ba6864dd99f985cf198768e6cf9f1c12e6c8cbd8
Merge: cea76fa 0137ef1
Author: Scott Howard <showard314 at gmail.com>
Date: Sun Oct 12 10:19:09 2014 -0400
Merge tag 'upstream/4.6.1'
Upstream version 4.6.1
Conflicts:
API.class
API-README | 1 +
API.class | Bin 0 -> 3772 bytes
API.java | 2 +-
ASIC-README | 74 ++++-
Makefile.am | 13 +-
NEWS | 95 ++++++
README | 74 ++++-
api-example.c | 35 +-
api.c | 5 +-
cgminer.c | 92 +++--
configure.ac | 96 ++++--
driver-avalon2.c | 767 ++++++++++++++++++++++--------------------
driver-avalon2.h | 23 +-
driver-bflsc.c | 438 ++++++++++++++++++++++--
driver-bflsc.h | 31 +-
driver-cointerra.c | 3 +-
driver-hashratio.c | 876 ++++++++++++++++++++++++++++++++++++++++++++++++
driver-hashratio.h | 131 ++++++++
driver-knc-spi-fpga.c | 904 --------------------------------------------------
driver-knc.c | 865 +++++++++++++++++++++++++++++++++++++++++++++++
driver-minion.c | 265 ++++++++++++---
hexdump.c | 2 +-
knc-asic.c | 551 ++++++++++++++++++++++++++++++
knc-asic.h | 88 +++++
knc-transport-spi.c | 148 +++++++++
knc-transport.h | 23 ++
miner.h | 11 +-
usbutils.c | 85 ++++-
usbutils.h | 9 +
util.c | 48 ++-
util.h | 2 +
31 files changed, 4273 insertions(+), 1484 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/cgminer.git
More information about the Pkg-bitcoin-commits
mailing list