]> granicus.if.org Git - graphviz/commit
Merge remote-tracking branch 'official/master'
authorCiprian TEODOROV <ciprian.teodorov@gmail.com>
Thu, 15 Jan 2015 19:24:25 +0000 (20:24 +0100)
committerCiprian TEODOROV <ciprian.teodorov@gmail.com>
Thu, 15 Jan 2015 19:24:25 +0000 (20:24 +0100)
commit67c03ab5e715e9a4202ecf111a6b68f40294853e
tree9f26c3be723b72c9dad51b5b6572624aac2e85a9
parent15b87381985cb54e9d76da7c4e46acf6c8d33f5c
parent74ce3dd4904a0a075c5184fccd26c5ff8346f554
Merge remote-tracking branch 'official/master'

Conflicts:
lib/sfdpgen/Makefile.am
configure.ac
lib/sfdpgen/Makefile.am