[qflow] 02/03: Merge tag 'upstream/1.0.93'

[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 8fb6c9c78812218def33d5af2104e7541a1d5e0f
Merge: dd9fd33 c69525d
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Thu Apr 16 20:02:27 2015 +0200

    Merge tag 'upstream/1.0.93'
    
    Conflicts:
    	VERSION

 VERSION                     |   2 +-
 config.log                  | 286 ++++++++++++++++++++++----------------------
 config.status               |  50 +++-----
 configure                   | 237 ++++++++++++++++++------------------
 scripts/Makefile            |  17 +--
 scripts/Makefile.in         |   3 +
 scripts/place2def.tcl       |  58 +++++----
 scripts/qflow.sh.in         |  27 ++++-
 scripts/resynthesize.sh     |   7 +-
 scripts/synthesize_yosys.sh |   7 +-
 scripts/ypostproc.tcl       |   2 +-
 src/Makefile                |  18 +--
 src/blifFanout.c            |   2 +-
 tech/Makefile               |   4 +-
 tech/osu035/Makefile        |   6 +-
 tech/osu035/osu035.sh       |   2 +-
 tech/osu050/Makefile        |   6 +-
 tech/osu050/osu050.sh       |   2 +-
 18 files changed, 390 insertions(+), 346 deletions(-)

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