[Pkg-electronics-commits] [gnucap] 33/49: Merge branch 'testing' into help

[felix salfelder]

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

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

commit 4b463878c19cbfcd751f7ac54d82bf9e03089ba3
Merge: a1094c0 bfae365
Author: al davis <ad211 at freeelectron.net>
Date:   Fri Feb 6 01:13:31 2015 -0500

    Merge branch 'testing' into help
    
    Conflicts:
    	apps/lang_spice.cc
    	include/patchlev.h
    	lib/e_base.cc
    	lib/e_compon.cc
    	lib/u_lang.cc

 apps/bm_generator.cc                 |  17 +++--
 apps/c_genrat.cc                     |  17 +++--
 apps/d_vs.cc                         |   6 +-
 apps/lang_spectre.cc                 |  40 ++++++-----
 apps/lang_spice.cc                   |  60 ++++++++--------
 apps/lang_verilog.cc                 |  51 ++++++++------
 apps/s_tr_set.cc                     |  10 +--
 apps/s_tr_swp.cc                     |  14 ++--
 include/e_card.h                     |   6 +-
 include/e_model.h                    |   4 +-
 include/io_error.h                   |   4 +-
 include/patchlev.h                   |   2 +-
 lib/d_logic.cc                       |   2 +-
 lib/d_subckt.cc                      |   2 +-
 lib/e_base.cc                        |   4 +-
 lib/e_card.cc                        |  14 ++--
 lib/e_compon.cc                      |  20 +++---
 lib/e_elemnt.cc                      |  14 ++--
 lib/u_lang.cc                        |  16 ++---
 lib/u_sim_data.cc                    |  52 +++++++-------
 tests/==out/c_genrat.1.ckt.out       | 130 +++++++++++++++++++++++++++++++++++
 tests/==out/d_vcvs.2.ckt.out         |  20 ++++++
 tests/==out/d_vs.1.gc.out            |   6 ++
 tests/==out/eq3-1153.forward.ckt.out |  23 +++++++
 tests/==out/eq3-1153.reverse.ckt.out |  23 +++++++
 tests/==out/lang_spectre.1.gc.out    |  32 +++++++++
 tests/==out/lang_spectre.2.gc.out    |  42 +++++++++++
 tests/==out/lang_spice.1.gc.out      |  28 ++++++++
 tests/==out/lang_verilog.1.gc.out    |  33 +++++++++
 tests/==out/lang_verilog.2.gc.out    |  41 +++++++++++
 tests/==out/lang_verilog.3.gc.out    |  35 ++++++++++
 tests/==out/s_tr.1.ckt.out           | 112 ++++++++++++++++++++++++++++++
 tests/c_genrat.1.ckt                 |  11 +++
 tests/c_sim.1.ckt.bad                |  15 ++++
 tests/d_vcvs.2.ckt                   |  22 ++++++
 tests/d_vs.1.gc                      |  12 ++++
 tests/eq3-1153.forward.ckt           | 108 +++++++++++++++++++++++++++++
 tests/eq3-1153.reverse.ckt           | 108 +++++++++++++++++++++++++++++
 tests/{spectre => lang_spectre.1.gc} |   2 +-
 tests/{spectre => lang_spectre.2.gc} |  14 ++--
 tests/{spice => lang_spice.1.gc}     |   0
 tests/{verilog => lang_verilog.1.gc} |   0
 tests/{verilog => lang_verilog.2.gc} |   8 +--
 tests/{verilog => lang_verilog.3.gc} |   6 ++
 tests/s_tr.1.ckt                     |  13 ++++
 tests/test                           |   7 ++
 46 files changed, 1031 insertions(+), 175 deletions(-)

diff --cc apps/lang_spice.cc
index 6b63895,c2ef8ee..dea1498
--- a/apps/lang_spice.cc
+++ b/apps/lang_spice.cc
@@@ -1,4 -1,4 +1,4 @@@
- /*$Id: lang_spice.cc 2015/01/21 al $ -*- C++ -*-
 -/*$Id: lang_spice.cc 2015/01/27 al $ -*- C++ -*-
++/*$Id: lang_spice.cc 2015/02/05 al $ -*- C++ -*-
   * Copyright (C) 2006 Albert Davis
   * Author: Albert Davis <aldavis at gnu.org>
   *
diff --cc include/patchlev.h
index 10df572,5f43224..cd155fb
--- a/include/patchlev.h
+++ b/include/patchlev.h
@@@ -1,1 -1,1 +1,1 @@@
- #define PATCHLEVEL "help 2015-01-22"
 -#define PATCHLEVEL "testing 2015-01-31"
++#define PATCHLEVEL "help 2015-02-05"
diff --cc lib/e_base.cc
index 4b22d0d,7130094..790c146
--- a/lib/e_base.cc
+++ b/lib/e_base.cc
@@@ -1,4 -1,4 +1,4 @@@
- /*$Id: e_base.cc 2015/01/21 al $ -*- C++ -*-
 -/*$Id: e_base.cc 2015/01/27 al $ -*- C++ -*-
++/*$Id: e_base.cc 2015/02/05 al $ -*- C++ -*-
   * Copyright (C) 2001 Albert Davis
   * Author: Albert Davis <aldavis at gnu.org>
   *
diff --cc lib/e_compon.cc
index e8a84b3,bb68ee5..cbd1f16
--- a/lib/e_compon.cc
+++ b/lib/e_compon.cc
@@@ -1,4 -1,4 +1,4 @@@
- /*$Id: e_compon.cc 2015/01/21 al $ -*- C++ -*-
 -/*$Id: e_compon.cc 2015/01/27 al $ -*- C++ -*-
++/*$Id: e_compon.cc 2015/02/05 al $ -*- C++ -*-
   * Copyright (C) 2001 Albert Davis
   * Author: Albert Davis <aldavis at gnu.org>
   *
diff --cc lib/u_lang.cc
index 46a24b3,2849298..2076e28
--- a/lib/u_lang.cc
+++ b/lib/u_lang.cc
@@@ -1,4 -1,4 +1,4 @@@
- /*$Id: u_lang.cc 2015/01/21 al $ -*- C++ -*-
 -/*$Id: u_lang.cc 2015/01/27 al $ -*- C++ -*-
++/*$Id: u_lang.cc 2015/02/05 al $ -*- C++ -*-
   * Copyright (C) 2006 Albert Davis
   * Author: Albert Davis <aldavis at gnu.org>
   *

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