[berkeley-abc] 02/03: Merge branch 'upstream'

[Ruben Undheim]

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

rubund-guest pushed a commit to branch master
in repository berkeley-abc.

commit 923f24e21cebaafaba2b92ccc6e7276d5427aabf
Merge: 4291abe cf3fb82
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Sat Nov 8 23:23:42 2014 +0100

    Merge branch 'upstream'

 Makefile                             |  15 +-
 abcexe.dsp                           |   8 +-
 abclib.dsp                           |  36 +-
 src/aig/gia/gia.h                    |  24 +-
 src/aig/gia/giaEnable.c              |   4 +-
 src/aig/gia/giaEquiv.c               |   4 +-
 src/aig/gia/giaHash.c                |  19 +
 src/aig/gia/giaQbf.c                 | 492 +++++++++++++++++++
 src/aig/gia/giaSim.c                 |  32 +-
 src/aig/gia/module.make              |   1 +
 src/aig/ivy/ivyRwr.c                 |   2 +-
 src/aig/ivy/ivySeq.c                 |   2 +-
 src/aig/saig/saigDup.c               |  64 +++
 src/base/abci/abc.c                  | 542 ++++++++++++++++++--
 src/base/abci/abcDar.c               |   2 +-
 src/base/abci/abcRec3.c              |   2 +-
 src/base/abci/module.make            |   8 +-
 src/base/cmd/cmdUtils.c              |  22 +-
 src/base/main/main.c                 | 390 +--------------
 src/base/main/mainFrame.c            |   1 +
 src/base/main/mainInit.c             |  43 +-
 src/base/main/mainInt.h              |  17 +-
 src/base/main/{main.c => mainReal.c} |  15 -
 src/base/main/module.make            |   1 +
 src/bdd/mtr/mtr.h                    |  12 +-
 src/bool/lucky/luckySimple.c         |   6 +-
 src/bool/rpo/rpo.c                   |   2 +-
 src/bool/rpo/rpo.h                   |   1 +
 src/map/if/ifTruth.c                 |  20 +-
 src/misc/extra/extra.h               |   2 +
 src/misc/extra/extraUtilFile.c       |  36 +-
 src/misc/extra/extraUtilSupp.c       |   2 +-
 src/misc/vec/vecInt.h                |   6 +
 src/misc/vec/vecPtr.h                |   2 +-
 src/misc/vec/vecStr.h                |   6 +
 src/opt/rwr/rwrEva.c                 |   2 +-
 src/proof/cec/cecCorr.c              |   8 +-
 src/python/pyabc.i                   |  10 +-
 src/sat/bmc/bmc.h                    |   1 +
 src/sat/bmc/bmcBmc3.c                |   2 +-
 src/sat/bmc/bmcCexTools.c            |   2 +-
 src/sat/bmc/bmcChain.c               | 363 ++++++++++++++
 src/sat/bmc/bmcFault.c               | 324 ++++++++----
 src/sat/bmc/module.make              |   1 +
 src/sat/bsat/satSolver.h             |   4 +-
 src/sat/bsat2/AbcApi.cpp             |  59 +++
 src/sat/bsat2/Alg.h                  |  84 ++++
 src/sat/bsat2/Alloc.h                | 131 +++++
 src/sat/bsat2/Dimacs.h               |  89 ++++
 src/sat/bsat2/Heap.h                 | 149 ++++++
 src/sat/bsat2/IntTypes.h             |  47 ++
 src/sat/bsat2/LICENSE                |  21 +
 src/sat/bsat2/MainSat.cpp            | 197 ++++++++
 src/sat/bsat2/MainSimp.cpp           | 206 ++++++++
 src/sat/bsat2/Map.h                  | 193 ++++++++
 src/sat/bsat2/Options.cpp            |  93 ++++
 src/sat/bsat2/Options.h              | 387 +++++++++++++++
 src/sat/bsat2/ParseUtils.h           | 122 +++++
 src/sat/bsat2/Queue.h                |  69 +++
 src/sat/bsat2/README                 |  24 +
 src/sat/bsat2/ReleaseNotes-2.2.0.txt |  79 +++
 src/sat/bsat2/SimpSolver.cpp         | 720 +++++++++++++++++++++++++++
 src/sat/bsat2/SimpSolver.h           | 197 ++++++++
 src/sat/bsat2/Solver.cpp             | 924 +++++++++++++++++++++++++++++++++++
 src/sat/bsat2/Solver.h               | 373 ++++++++++++++
 src/sat/bsat2/SolverTypes.h          | 407 +++++++++++++++
 src/sat/bsat2/Sort.h                 |  98 ++++
 src/sat/bsat2/System.cpp             |  95 ++++
 src/sat/bsat2/System.h               |  60 +++
 src/sat/bsat2/Vec.h                  | 130 +++++
 src/sat/bsat2/XAlloc.h               |  45 ++
 src/sat/bsat2/module.make            |   7 +
 src/sat/bsat2/pstdint.h              | 813 ++++++++++++++++++++++++++++++
 73 files changed, 7740 insertions(+), 637 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/berkeley-abc.git