[qflow] 01/04: 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 qflow.

commit 1865ce53c9aa74d0a101d80d5930c9ba44d9e81f
Merge: 15105b0 5b53077
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Sat May 30 12:31:19 2015 +0200

    Merge branch 'upstream'
    
    Conflicts:
    	VERSION

 .gitignore                                     |   20 +-
 README                                         |    7 +-
 VERSION                                        |    2 +-
 config.log                                     |  252 ++-
 config.status                                  |    6 +-
 configure                                      |  439 +-----
 configure.in                                   |  101 +-
 scripts/Makefile                               |   15 +-
 scripts/Makefile.in                            |   13 +-
 scripts/bdnet2cel.tcl                          |  418 -----
 scripts/bdnet2sim.tcl                          |  211 ---
 scripts/blif2cel.tcl                           |   18 +-
 scripts/blifanno.tcl                           |  205 +++
 scripts/clocktree.tcl                          |  706 ---------
 scripts/outpreporig.tcl                        |   78 -
 scripts/outputprep.tcl                         |   98 --
 scripts/place2def.tcl                          |    5 +
 scripts/placement.sh                           |   74 +
 scripts/postproc.tcl                           |  340 ----
 scripts/qflow.sh.in                            |   52 +-
 scripts/resynthesize.sh                        |  263 ----
 scripts/rtl2bdnet.tcl                          |  176 ---
 scripts/setreset.tcl                           |  210 ---
 scripts/{synthesize_yosys.sh => synthesize.sh} |   41 +-
 scripts/synthesize_odin.sh                     |  534 -------
 scripts/vispreproc.tcl                         |   50 -
 scripts/vmunge.tcl                             |  186 ---
 src/Makefile                                   |   29 +-
 src/Makefile.in                                |   19 +-
 src/blifFanout.c                               | 1120 +++++++------
 src/dcombine.c                                 |  517 ------
 src/hash.c                                     |  401 +++++
 src/hash.h                                     |   53 +
 src/hash.o                                     |  Bin 0 -> 14952 bytes
 src/{liberty2tech.c => readliberty.c}          |  382 ++---
 src/readliberty.h                              |   84 +
 src/readliberty.o                              |  Bin 0 -> 43464 bytes
 src/verilogpp.c                                | 2014 ------------------------
 src/vesta.c                                    |   18 +-
 tech/Makefile                                  |    2 +-
 tech/osu035/Makefile                           |    8 +-
 tech/osu035/Makefile.in                        |    6 +-
 tech/osu035/gate.cfg                           |   52 -
 tech/osu035/osu035.genlib                      |   72 -
 tech/osu035/osu035.super                       |   48 -
 tech/osu050/Makefile                           |    8 +-
 tech/osu050/Makefile.in                        |    6 +-
 tech/osu050/gate.cfg                           |   52 -
 tech/osu050/osu050.genlib                      |   72 -
 tech/osu050/osu050.super                       |   48 -
 50 files changed, 1833 insertions(+), 7698 deletions(-)

diff --cc VERSION
index f42a27c,45a1b3f..781dcb0
--- a/VERSION
+++ b/VERSION
@@@ -1,1 -1,1 +1,1 @@@
- 1.0.96
 -1.1.2
++1.1.3

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