resolved conflicts

ChangeLog

@@ -1,11 +1,8 @@
-<<<<<<< HEAD
-=======
 2011-03-18  Stefan Jahn  <stefan@lkcc.org>
 
 	* configure.ac: Released version 0.0.16 and bumped up to version
 	0.0.17.
 
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
 2009-04-27  Stefan Jahn  <stefan@lkcc.org>
 
 	* qucs-filter-v2: Added preliminary 2nd version of qucs-filter

NEWS

@@ -1,11 +1,7 @@
 --
 -- NEWS
 --
-<<<<<<< HEAD
--- Copyright (C) 2003-2010 Stefan Jahn <stefan@lkcc.org>
-=======
 -- Copyright (C) 2003-2011 Stefan Jahn <stefan@lkcc.org>
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
 --
 -- This is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -27,11 +23,6 @@ This file lists user visible changes that were made between releases.  For
 more verbose descriptions of these and internal changes see the ChangeLog
 files.
 
-<<<<<<< HEAD
-Version 0.0.16
---------------
-
-=======
 Version 0.0.17
 --------------
 
@@ -40,20 +31,15 @@ Version 0.0.16
 --------------
 
  * implementation of interactive GNU Octave connection
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
  * support for C++ code export of symbol drawings associated with
    Verilog-A files
  * direct association of symbol drawings to Verilog-HDL, Verilog-A
    and VHDL code
  * added Verilog-HDL and Verilog-A syntax highlighting in text documents
  * support for pre-compiled VHDL modules and libraries made from user
    written VHDL code
-<<<<<<< HEAD
- * new components: NIGBT, HICUM L2 v2.24, HICUM L0 v1.2g
-=======
  * new components: NIGBT, HICUM L2 v2.24, HICUM L0 v1.2g, tunnel diode,
    ideal coupled transmission line, hybrid, HICUM L0 v1.3
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
  * translation into Kazakh
  * allow equations in Verilog-HDL and VHDL subcircuits
 

README

@@ -1,11 +1,7 @@
 --
 -- README
 -- 
-<<<<<<< HEAD
--- Copyright (C) 2003, 2005 Stefan Jahn <stefan@lkcc.org>
-=======
 -- Copyright (C) 2003, 2005, 2011 Stefan Jahn <stefan@lkcc.org>
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
 -- 
 -- This is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -76,17 +72,6 @@ file INSTALL included in this distribution.
 Please note:  Users of the FreeBSD OS may use a GNU make (probably gmake)
 to compile and install the package.
 
-<<<<<<< HEAD
-Getting the latest CVS snapshot
-===============================
-
-You can always get the latest Qucs version from our CVS repository.
-Please use an official release if you want to work with Qucs.  The CVS
-version might not even compile.
-
-    $ cvs -z3 -d:pserver:anonymous@qucs.cvs.sourceforge.net:/cvsroot/qucs \
-      co qucs
-=======
 Getting the latest SVN snapshot
 ===============================
 
@@ -95,7 +80,6 @@ Please use an official release if you want to work with Qucs.  The SVN
 version might not even compile.
 
     $ svn co https://qucs.svn.sourceforge.net/svnroot/qucs/trunk/qucs
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
 
 Press 'Enter' when asked for a password.  Run `sh autogen.sh' and
 `configure' with the appropriate options.  Maintainance currently

RELEASE

@@ -3,11 +3,7 @@
 -- 
 -- release instructions.
 -- 
-<<<<<<< HEAD
--- Copyright (C) 2004, 2006 Stefan Jahn <stefan@lkcc.org>
-=======
 -- Copyright (C) 2004, 2006, 2011 Stefan Jahn <stefan@lkcc.org>
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
 -- 
 -- This is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -42,21 +38,13 @@ Distribution process:
     command `automake -a -f -c' with latest automake version installed.
   - Run `make distclean', `sh autogen.sh' and `make all'.
   - Run `make distcheck'.
-<<<<<<< HEAD
-  - Check this status into CVS and tag it.
-=======
   - Check this status into SVN and tag it.
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
 
 * Bump up version.
   - Add a ChangeLog entry in toplevel directory.
   - Add new section in NEWS.
   - Bump up version number in `configure.ac'.
-<<<<<<< HEAD
-  - Check into CVS.
-=======
   - Check into SVN.
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
 
 * Distribute the package. 
   - Upload the package to the SourceForge server and add a News item.

autodsp.sh

@@ -19,11 +19,7 @@
 # the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
 # Boston, MA 02110-1301, USA.  
 #
-<<<<<<< HEAD
-# $Id: autodsp.sh,v 1.1 2007/02/25 17:04:18 ela Exp $
-=======
 # $Id$
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
 #
 
 use strict;

configure.ac

@@ -2,11 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-<<<<<<< HEAD
-AC_INIT(qucs,0.0.16,qucs-bugs@lists.sourceforge.net)
-=======
 AC_INIT(qucs,0.0.17,qucs-bugs@lists.sourceforge.net)
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
 AC_CONFIG_SRCDIR([qucs/qucs.cpp])
 AC_CONFIG_HEADERS([config.h])
 
@@ -270,13 +266,10 @@ DOC_PATH="$prefix/share/qucs/docs/"
 AC_DEFINE_UNQUOTED([DOCDIR], ["$DOC_PATH"],
   [Where the documentation files go.])
 unset DOC_PATH
-<<<<<<< HEAD
-=======
 OCTAVE_PATH="$prefix/share/qucs/octave/"
 AC_DEFINE_UNQUOTED([OCTAVEDIR], ["$OCTAVE_PATH"],
   [Where the octave script files go.])
 unset OCTAVE_PATH
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
 
 dnl Definitions at top of <config.h>.
 AH_TOP([
@@ -323,10 +316,7 @@ AC_CONFIG_FILES([Makefile
 		 qucs-attenuator/bitmaps/Makefile
 		 qucs/Makefile
 		 qucs/bitmaps/Makefile
-<<<<<<< HEAD
-=======
 		 qucs/octave/Makefile
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
 		 qucs/components/Makefile
 		 qucs/diagrams/Makefile
 		 qucs/paintings/Makefile

contrib/innosetup/freehdl.iss

@@ -1,11 +1,7 @@
 ;
 ; freehdl.iss - inno Setup script file
 ;
-<<<<<<< HEAD
-; Copyright (C) 2006, 2008 Stefan Jahn <stefan@lkcc.org>
-=======
 ; Copyright (C) 2006, 2008, 2009, 2011 Stefan Jahn <stefan@lkcc.org>
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
 ;
 ; This is free software; you can redistribute it and/or modify
 ; it under the terms of the GNU General Public License as published by
@@ -27,17 +23,10 @@
 ; NOTE: additional files: bin/libregex.dll lib/libregex.a
 ;
 
-<<<<<<< HEAD
-#define RELEASE "0.0.7"
-#define BASENAME "freehdl"
-#define APPNAME "FreeHDL"
-#define APPVERNAME "FreeHDL 0.0.7 binary package for Win32"
-=======
 #define RELEASE "0.0.8"
 #define BASENAME "freehdl"
 #define APPNAME "FreeHDL"
 #define APPVERNAME "FreeHDL 0.0.8 binary package for Win32"
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
 #define URL "http://www.freehdl.seul.org"
 #define TREE "C:\home\freetree"
 

contrib/innosetup/qucs.iss

@@ -1,11 +1,7 @@
 ;
 ; qucs.iss - inno Setup script file
 ;
-<<<<<<< HEAD
-; Copyright (C) 2005, 2006, 2007, 2008 Stefan Jahn <stefan@lkcc.org>
-=======
 ; Copyright (C) 2005-2011 Stefan Jahn <stefan@lkcc.org>
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
 ;
 ; This is free software; you can redistribute it and/or modify
 ; it under the terms of the GNU General Public License as published by
@@ -23,17 +19,10 @@
 ; Boston, MA 02110-1301, USA.
 ;
 
-<<<<<<< HEAD
-#define RELEASE "0.0.14"
-#define BASENAME "qucs"
-#define APPNAME "Qucs"
-#define APPVERNAME "Quite Universal Circuit Simulator 0.0.14 binary package for Win32"
-=======
 #define RELEASE "0.0.16"
 #define BASENAME "qucs"
 #define APPNAME "Qucs"
 #define APPVERNAME "Quite Universal Circuit Simulator 0.0.16 binary package for Win32"
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
 #define URL "http://qucs.sourceforge.net"
 #define TREE "C:\home\qucstree"
 

qucs-help/ChangeLog

@@ -1,11 +1,8 @@
-<<<<<<< HEAD
-=======
 2011-03-11  Stefan Jahn  <stefan@lkcc.org>
 
 	* docs/en/octave.html: Added short description of Octave
 	interface.
 
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
 2009-10-08  Stefan Jahn  <stefan@lkcc.org>
 
 	* docs/cs/index.html: Updated Czech translations of internal help

qucs-help/docs/en/Makefile.am

@@ -4,11 +4,7 @@
 #
 # Automake input file.
 #
-<<<<<<< HEAD
-# Copyright (C) 2004, 2005, 2006 Stefan Jahn <stefan@lkcc.org>
-=======
 # Copyright (C) 2004, 2005, 2006, 2011 Stefan Jahn <stefan@lkcc.org>
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
 #
 # This is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,11 +24,7 @@
 
 HTML = index.html short.html start.html mathfunc.html subcircuit.html       \
   programs.html internal.html characters.html matching.html start_digi.html \
-<<<<<<< HEAD
-  start_opt.html
-=======
   start_opt.html octave.html
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
 PIC  = qucsmain.png paste.png wire.png select.png contab.png subcircuit.png \
   qucsdigi.png optimization1.png optimization2.png optimization3.png        \
   optimization4.png optimization5.png optimization6.png optimization7.png   \

qucs-help/docs/en/index.html

@@ -20,10 +20,7 @@ <h1>
 <a href="start.html">Getting Started - Analog Simulation</a><br>
 <a href="start_digi.html">Getting Started - Digital Simulation</a><br>
 <a href="start_opt.html">Getting Started - Optimization</a><br>
-<<<<<<< HEAD
-=======
 <a href="octave.html">Getting Started - Octave Scripts</a><br>
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
 <a href="short.html">Short Description of Actions</a><br>
 <a href="subcircuit.html">Working with Subcircuits</a><br>
 <a href="mathfunc.html">Short Description of mathematical Functions</a><br>

qucs-lib/ChangeLog

@@ -1,10 +1,7 @@
-<<<<<<< HEAD
-=======
 2011-03-01  Stefan Jahn  <stefan@lkcc.org>
 
 	* library/Ideal.lib: Fixed HardLimiter and Abs components.
 
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
 2010-10-23  Stefan Jahn  <stefan@lkcc.org>
 
 	* symbolwidget.cpp (createSymbol): Adjusted symbol for new HICUM

qucs-lib/library/Ideal.lib

@@ -394,11 +394,7 @@ EDD:D1 _net2 gnd gnd _net0 I1="D1.I1" Q1="D1.Q1" I2="D1.I2" Q2="D1.Q2"
   </Model>
   <Symbol>
     <Line -20 -20 0 40 #000080 2 1>
-<<<<<<< HEAD
-    <.PortSym 30 0 3 180>
-=======
     <.PortSym 30 0 2 180>
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
     <Line 30 0 -10 0 #000080 2 1>
     <Line -30 0 10 0 #000080 2 1>
     <Line -20 -20 40 0 #000080 2 1>
@@ -578,11 +574,7 @@ EDD:D1 _net2 gnd gnd _net0 I1="D1.I1" Q1="D1.Q1" I2="D1.I2" Q2="D1.Q2"
 .Def:End
   </Model>
   <Symbol>
-<<<<<<< HEAD
-    <.PortSym 30 0 3 180>
-=======
     <.PortSym 30 0 2 180>
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
     <Line -30 0 10 0 #000080 2 1>
     <.PortSym -30 0 1 0>
     <Line 20 0 10 0 #000080 2 1>

qucs-lib/symbolwidget.cpp

@@ -263,11 +263,7 @@ int SymbolWidget::createSymbol(const QString& Lib_, const QString& Comp_)
   else if(Comp == "hicumL2V2p1" || Comp == "hic2_full" ||
 	  Comp == "hic0_full" || Comp == "hicumL0V1p2" ||
 	  Comp == "hicumL2V2p23" || Comp == "hicumL2V2p24" ||
-<<<<<<< HEAD
-	  Comp == "hicumL0V1p2g") {
-=======
 	  Comp == "hicumL0V1p2g" || Comp == "hicumL0V1p3") {
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
     // normal bipolar
     Lines.append(new Line(-10,-15,-10, 15,QPen(QPen::darkBlue,3)));
     Lines.append(new Line(-30,  0,-10,  0,QPen(QPen::darkBlue,2)));

qucs-transcalc/ChangeLog

@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 2011-04-03  Stefan Jahn  <stefan@lkcc.org>
 
 	* rectwaveguide.cpp (analyze): Fixed calculation of Z0 in
@@ -10,7 +8,6 @@
 	* coax.cpp (alphac_coax): Fixed factor of 2 in conductor loss
 	calculation.
 
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
 2009-05-14  Stefan Jahn  <stefan@lkcc.org>
 
 	* coax.cpp (show_results): Fixed computation of cut-off

qucs-transcalc/coax.cpp

@@ -3,11 +3,7 @@
  * 
  * Copyright (C) 2001 Gopal Narayanan <gopal@astro.umass.edu>
  * Copyright (C) 2002 Claudio Girardi <claudio.girardi@ieee.org>
-<<<<<<< HEAD
- * Copyright (C) 2005, 2006, 2009 Stefan Jahn <stefan@lkcc.org>
-=======
  * Copyright (C) 2005, 2006, 2009, 2011 Stefan Jahn <stefan@lkcc.org>
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -104,11 +100,7 @@ double coax::alphac_coax ()
 {
   double ac, Rs;
   Rs = sqrt((M_PI * f * mur* MU0)/sigma);
-<<<<<<< HEAD
-  ac = (0.5 * sqrt(er)) * (((1/din) + (1/dout))/log(dout/din)) * (Rs/ZF0);
-=======
   ac = sqrt(er) * (((1/din) + (1/dout))/log(dout/din)) * (Rs/ZF0);
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
   ac = ac * 20.0 / log(10.0);
   return ac;
 }