[Pkg-electronics-commits] [gnucap] 29/43: Merge remote-tracking branches 'origin/unused-1', 'origin/plugpath-bug' and 'origin/gnucap.conf-1' into develop

[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 868ad1c8629cf22881589becaf87af8eb9ab7895
Merge: 8586afc 646d2fc f3059b5 878e8e7
Author: al davis <ad211 at freeelectron.net>
Date:   Sat May 20 23:14:42 2017 -0400

    Merge remote-tracking branches 'origin/unused-1', 'origin/plugpath-bug' and 'origin/gnucap.conf-1' into develop
    
    Conflicts:
    	include/patchlev.h

 Make3                         |  12 +++-
 include/e_compon.h            |   2 +
 include/patchlev.h            |   2 +-
 lib/c_attach.cc               | 143 +++++++++++++++++++++++++++++-------------
 main/Make1                    |   4 +-
 main/configure                |   2 +
 main/gnucap-conf.in           |  16 ++---
 main/gnucap.conf.in           |  12 ++++
 main/main.cc                  |   9 ++-
 tests/==out/c_attach.1.gc.out |  16 +++++
 tests/c_attach.1.gc           |   6 ++
 11 files changed, 166 insertions(+), 58 deletions(-)

diff --cc include/patchlev.h
index 1de38e1,1de38e1,7ff64a9,6cb20dc..c6740eb
--- a/include/patchlev.h
+++ b/include/patchlev.h
@@@@@ -1,1 -1,1 -1,1 -1,1 +1,1 @@@@@
--  #define PATCHLEVEL "unstable 2017.04.18"
  - #define PATCHLEVEL "plugpath-bug 2017.05.13"
   -#define PATCHLEVEL "gnucap.conf-1 2017.05.20"
++++#define PATCHLEVEL "develop 2017.05.20"

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