[qflow] 01/03: Merge tag 'upstream/1.1.7'

[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 e2e12c13db34af144fd9529ff62ca66ea362bc0d
Merge: fdee28d 591e874
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Thu Jul 23 10:24:38 2015 +0200

    Merge tag 'upstream/1.1.7'
    
    Conflicts:
    	VERSION

 VERSION                                         |     2 +-
 config.log                                      |    55 +-
 config.status                                   |    15 +-
 configure                                       |    56 +-
 configure.in                                    |    15 +-
 scripts/Makefile                                |    57 +-
 scripts/Makefile.in                             |    53 +-
 scripts/{addspacers.tcl => addspacers.tcl.in}   |     2 +-
 scripts/{blif2cel.tcl => blif2cel.tcl.in}       |     2 +-
 scripts/{blif2sim.tcl => blif2sim.tcl.in}       |     2 +-
 scripts/{blifanno.tcl => blifanno.tcl.in}       |     2 +-
 scripts/{decongest.tcl => decongest.tcl.in}     |     2 +-
 scripts/{getfillcell.tcl => getfillcell.tcl.in} |     2 +-
 scripts/{place2def.tcl => place2def.tcl.in}     |     2 +-
 scripts/{place2def2.tcl => place2def2.tcl.in}   |     2 +-
 scripts/{place2lef2.tcl => place2lef2.tcl.in}   |     1 +
 scripts/{place2net2.tcl => place2net2.tcl.in}   |     2 +-
 scripts/{rtl2sim.tcl => rtl2sim.tcl.in}         |     2 +-
 scripts/synthesize.sh                           |    17 +-
 scripts/{ybuffer.tcl => ybuffer.tcl.in}         |     2 +-
 scripts/{ypostproc.tcl => ypostproc.tcl.in}     |     2 +-
 src/Makefile                                    |     6 +-
 src/Makefile.in                                 |     4 +-
 src/blif2Verilog.c                              |    36 +-
 src/blifFanout.c                                |    49 +-
 src/hash.o                                      |   Bin 14952 -> 14952 bytes
 src/readliberty.c                               |    50 +-
 src/readliberty.o                               |   Bin 43464 -> 44368 bytes
 src/vesta.c                                     |    97 +-
 tech/Makefile                                   |     4 +-
 tech/Makefile.in                                |     2 +-
 tech/osu018/Makefile                            |    41 +
 tech/osu018/Makefile.in                         |    41 +
 tech/osu018/SCN6M_DEEP.09.tech                  | 11605 ++++++++++++++++++++++
 tech/osu018/osu018.magicrc.in                   |    15 +
 tech/osu018/osu018.par                          |    67 +
 tech/osu018/osu018.prm                          |    26 +
 tech/osu018/osu018.sh                           |    72 +
 tech/osu018/osu018_stdcells.lef                 |  2941 ++++++
 tech/osu018/osu018_stdcells.lib                 |  6141 ++++++++++++
 tech/osu018/osu018_stdcells.sp                  |   803 ++
 tech/osu018/osu018_stdcells.v                   |  1050 ++
 tech/osu035/Makefile                            |     2 +-
 tech/osu035/osu035_stdcells.lef                 |     8 +-
 tech/osu050/Makefile                            |     2 +-
 tech/osu050/osu050_stdcells.lef                 |     6 +-
 46 files changed, 23185 insertions(+), 178 deletions(-)

diff --cc VERSION
index 781dcb0,0664a8f..2bf1ca5
--- a/VERSION
+++ b/VERSION
@@@ -1,1 -1,1 +1,1 @@@
- 1.1.3
 -1.1.6
++1.1.7

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