]> granicus.if.org Git - graphviz/commit
Merge branch 'master' of hg:graphviz
authorEmden R. Gansner <erg@research.att.com>
Fri, 13 Sep 2013 14:50:06 +0000 (10:50 -0400)
committerEmden R. Gansner <erg@research.att.com>
Fri, 13 Sep 2013 14:50:06 +0000 (10:50 -0400)
commitb3b37b0432d686f24061c61cd306e585b8b09728
tree9e21fb121b4cabe9e826623a5b90a4618c73cf0c
parent26561d25d67c12a21fdb7a791ffb3b9f21b691e7
parent749b4c9ec1027926ee1f8edf119c75c63cccd1f7
Merge branch 'master' of hg:graphviz

Conflicts:
doc/info/attrs.html
doc/infosrc/attrs
lib/dotgen/aspect.c
lib/dotgen/aspect.c