summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/x11/xm_line.c
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2008-08-08 15:32:24 -0700
committerEric Anholt <[email protected]>2008-08-08 15:32:24 -0700
commit53675e5c05c0598b7ea206d5c27dbcae786a2c03 (patch)
treed4bc5c9aa659b6b0e82245b0405ca740cc3d2a66 /src/mesa/drivers/x11/xm_line.c
parent501338d70e96e0388fd5198625d856c4ec07745f (diff)
parentd2796939f18815935c8fe1effb01fa9765d6c7d8 (diff)
Merge branch 'drm-gem'
Conflicts: src/mesa/drivers/dri/intel/intel_span.c src/mesa/main/fbobject.c This converts the i915 driver to use the GEM interfaces for object management.
Diffstat (limited to 'src/mesa/drivers/x11/xm_line.c')
0 files changed, 0 insertions, 0 deletions