[Pkg-electronics-commits] [gnucap] 35/43: Merge branches 'spice-wrapper' and 'attachfix-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 a6d09cbbeebe7a6ee1c0558b298f18394afc00be
Merge: 868ad1c ca878ea 3ec728c
Author: al davis <ad211 at freeelectron.net>
Date:   Sun Jun 25 02:28:00 2017 -0400

    Merge branches 'spice-wrapper' and 'attachfix-1' into develop

 include/m_matrix.h       |  8 ++++----
 include/patchlev.h       |  2 +-
 include/spice-wrapper.cc | 38 +++++++++++++++++++++-----------------
 lib/c_attach.cc          | 44 +++++++++++++++++++++-----------------------
 lib/u_sim_data.cc        |  2 +-
 5 files changed, 48 insertions(+), 46 deletions(-)

diff --cc include/patchlev.h
index c6740eb,2c25240,23598ab..2302981
--- a/include/patchlev.h
+++ b/include/patchlev.h
@@@@ -1,1 -1,1 -1,1 +1,1 @@@@
-  #define PATCHLEVEL "develop 2017.05.20"
 - #define PATCHLEVEL "spice-wrapper 2017.06.07"
  -#define PATCHLEVEL "attachfix-1 2017.06.22"
+++#define PATCHLEVEL "develop 2017.06.25"

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