SourceForge has been redesigned. Learn more.
Close

Commit [2a3cdf]  Maximize  Restore  History

This commit pulls major changes from master into cairo-alpha.

Merge commit '0e24c091dc4e070e7bb4c8c1bed765dc0ba87ae6' into cairo-alpha

Conflicts:
configure.ac
examples/rulers.c
gtk/gtkdatabox.c
gtk/gtkdatabox_bars.c
gtk/gtkdatabox_graph.c
gtk/gtkdatabox_grid.c
gtk/gtkdatabox_lines.c
gtk/gtkdatabox_markers.c
gtk/gtkdatabox_offset_bars.c
gtk/gtkdatabox_points.c
gtk/gtkdatabox_regions.c
gtk/gtkdatabox_ruler.c
gtk/gtkdatabox_xyc_graph.c
gtk/gtkdatabox_xyyc_graph.c
gtkdatabox.pc

Matt Flax Matt Flax 2013-10-05