[Python-modules-commits] [qscintilla2] 09/09: Merge branch 'patch-queue/debian/master' of git+ssh://git.debian.org/git/python-modules/packages/qscintilla2 into patch-queue/debian/master

[Scott Kitterman]

This is an automated email from the git hooks/post-receive script.

kitterman pushed a commit to branch patch-queue/debian/master
in repository qscintilla2.

commit 6fb9411b4cd78ac00350b1845c9cd4ef786fa4cf
Merge: 04c7355 6d9d122
Author: Scott Kitterman <scott at kitterman.com>
Date:   Sat Dec 16 01:50:01 2017 -0500

    Merge branch 'patch-queue/debian/master' of git+ssh://git.debian.org/git/python-modules/packages/qscintilla2 into patch-queue/debian/master
    
    Conflicts:
    	Python/configure.py
    	Qt4Qt5/features/qscintilla2.prf
    	Qt4Qt5/qscintilla.pro
    	designer-Qt4Qt5/designer.pro

 Qt4Qt5/qscintilla.pro        | 1 +
 designer-Qt4Qt5/designer.pro | 3 +++
 2 files changed, 4 insertions(+)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/qscintilla2.git