diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2009-07-21 22:28:44 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2009-07-21 22:28:44 +0100 |
commit | 1ae5942a3aa9f73aa71438dc40221836b0dff7e2 (patch) | |
tree | a39297460aaaf3b88c4b26480d12b40ec4eed545 /perf/cairo-stats.c | |
parent | fd9df4978d56bbb85ecd795afce72c0310dbcf3f (diff) | |
parent | 6a5957475139a7c80a6bb55fb63927e5ec8866f6 (diff) |
Merge commit 'anholt/gl'
Conflicts:
boilerplate/Makefile.sources
boilerplate/cairo-boilerplate.c
build/configure.ac.features
src/cairo.h
util/cairo-script/Makefile.am
Diffstat (limited to 'perf/cairo-stats.c')
0 files changed, 0 insertions, 0 deletions