[qflow] 01/02: Merge tag 'upstream/1.0.96'

[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 b83159a4df8a8adbadd4c029ad3c1237a946b424
Merge: 90b8559 84dab5a
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Tue May 12 21:31:40 2015 +0200

    Merge tag 'upstream/1.0.96'
    
    Conflicts:
    	VERSION

 VERSION                       |    2 +-
 scripts/addspacers.tcl        |    2 +-
 scripts/bdnet2cel.tcl         |    2 +-
 scripts/bdnet2sim.tcl         |    2 +-
 scripts/blif2sim.tcl          |    2 +-
 scripts/clocktree.tcl         |   15 +-
 scripts/decongest.tcl         |  155 ++++--
 scripts/getfillcell.tcl       |    2 +-
 scripts/outpreporig.tcl       |    2 +-
 scripts/outputprep.tcl        |    2 +-
 scripts/place2def.tcl         |    2 +-
 scripts/postproc.tcl          |    2 +-
 scripts/qflow.sh.in           |    2 +
 scripts/resynthesize.sh       |   21 +-
 scripts/rtl2bdnet.tcl         |    2 +-
 scripts/rtl2sim.tcl           |    2 +-
 scripts/setreset.tcl          |    2 +-
 scripts/synthesize_yosys.sh   |   21 +-
 scripts/vispreproc.tcl        |    2 +-
 scripts/vmunge.tcl            |    2 +-
 scripts/ybuffer.tcl           |    2 +-
 scripts/ypostproc.tcl         |    2 +-
 src/blif2Verilog.c            |    5 +
 tech/osu035/Makefile          |    1 +
 tech/osu035/Makefile.in       |    1 +
 tech/osu035/osu035_stdcells.v | 1140 +++++++++++++++++++++++++++++++++++++++++
 tech/osu050/Makefile          |    1 +
 tech/osu050/Makefile.in       |    1 +
 tech/osu050/osu05_stdcells.v  | 1140 +++++++++++++++++++++++++++++++++++++++++
 29 files changed, 2473 insertions(+), 64 deletions(-)

diff --cc VERSION
index 87903b6,875bf08..f42a27c
--- a/VERSION
+++ b/VERSION
@@@ -1,1 -1,1 +1,1 @@@
- 1.0.93
 -1.0.95
++1.0.96

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