[Python-modules-commits] [pydot] 01/13: merge patched into master

[Sandro Tosi]

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

morph pushed a commit to branch master
in repository pydot.

commit a0fbcd486c36ff525454b8ac3124306b4dcfc7c3
Merge: f5b9462 a9ef0a0
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Jan 10 00:23:14 2016 +0000

    merge patched into master

 debian/.git-dpm |   2 +-
 dot_parser.py   |   5 +-
 pydot.py        | 947 ++++++++++++++++++++++++++++----------------------------
 setup.py        |  37 +--
 4 files changed, 488 insertions(+), 503 deletions(-)

diff --cc debian/.git-dpm
index 7e85352,0000000..2ff81bf
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
 +9082aad68503a6589f24cda3f9bfa9bd9834a476
- 9082aad68503a6589f24cda3f9bfa9bd9834a476
++a9ef0a090ba73420f11746a7fc4791b77b8f91c5
 +7a2668df205a82c26ff478cee16bdac7ac77026b
 +7a2668df205a82c26ff478cee16bdac7ac77026b
 +pydot_1.0.28.orig.tar.gz
 +3945af1765943807d72e773c7ac853f008ebb0b2
 +19711
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

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