[sigrok-firmware-fx2lafw] 04/06: Merge tag 'upstream/0.1.4'

[Zoltan Gyarmati]

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

zgyarmati-guest pushed a commit to branch master
in repository sigrok-firmware-fx2lafw.

commit 4c7179bd394f1935414b0619f33e903abfb8d9ac
Merge: b735640 8341ab0
Author: Zoltan Gyarmati <mr.zoltan.gyarmati at gmail.com>
Date:   Wed Mar 1 01:25:52 2017 +0100

    Merge tag 'upstream/0.1.4'
    
    Upstream version 0.1.4

 ChangeLog                                          | 416 ++++++++++++++++
 Makefile.am                                        |  54 +-
 Makefile.in                                        |  53 +-
 NEWS                                               |  17 +
 README                                             |  55 ++-
 configure                                          |  20 +-
 configure.ac                                       |   2 +-
 gpif-acquisition.c                                 |  50 +-
 hantek_6022be.c                                    | 469 ++++++++++++++++++
 hw/braintechnology-usb-lps/dscr.a51                |   3 +
 hw/cwav-usbeeax/dscr.a51                           |   3 +
 hw/cwav-usbeedx/dscr.a51                           |   3 +
 hw/cwav-usbeesx/dscr.a51                           |   3 +
 hw/{cwav-usbeedx => cwav-usbeezx}/dscr.a51         |   7 +-
 hw/cypress-fx2/dscr.a51                            |   3 +
 .../dscr.a51                                       |  12 +-
 .../dscr.a51                                       |  12 +-
 hw/saleae-logic/dscr.a51                           |   3 +
 hw/sigrok-fx2-16ch/dscr.a51                        |   3 +
 hw/sigrok-fx2-8ch/dscr.a51                         |   3 +
 include/command.h                                  |   2 +
 .../dscr.a51 => include/common.inc                 |  60 ++-
 include/dscr.inc                                   |  55 +--
 include/dscr_hantek_6022be.inc                     | 355 ++++++++++++++
 include/fx2lafw.h                                  |   2 +-
 sainsmart_dds120.c                                 | 543 +++++++++++++++++++++
 26 files changed, 2080 insertions(+), 128 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sigrok-firmware-fx2lafw.git