[Pkg-electronics-commits] [gnucap] 11/11: Merge branch 'upstream'

[felix salfelder]

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

felix-guest pushed a commit to branch master
in repository gnucap.

commit 6ad9a3c7c0c4921773c9dd6a7c87bec1e80a3f35
Merge: 03f6e89 b2f0e64
Author: Felix Salfelder <felix at salfelder.org>
Date:   Fri Aug 5 14:18:34 2016 +0100

    Merge branch 'upstream'
    
    gnucap-conf. finally

 include/patchlev.h  |  2 +-
 main/Make1          |  2 +-
 main/configure      | 16 ++++++++++++++++
 main/gnucap-conf.in | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 72 insertions(+), 2 deletions(-)

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