[qflow] 08/13: Merge tag 'upstream/1.0.90'

[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 9f286160c1fd64384342abd9ae7c0b00596d4d52
Merge: 942f3a2 4d5038f
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Thu Apr 16 19:09:11 2015 +0200

    Merge tag 'upstream/1.0.90'
    
    Conflicts:
    	VERSION

 .gitignore                  |  1 +
 VERSION                     |  2 +-
 scripts/Makefile.in         | 12 ++++-----
 scripts/blif2cel.tcl        | 60 +++++++++++++++++++++++++++++++--------------
 scripts/synthesize_yosys.sh | 22 +++++++++++++----
 src/Makefile.in             | 16 ++++++------
 tech/Makefile.in            |  2 +-
 tech/osu035/Makefile.in     |  4 +--
 tech/osu050/Makefile.in     |  4 +--
 9 files changed, 79 insertions(+), 44 deletions(-)

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