diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2009-12-22 20:54:26 +0100 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2009-12-22 20:54:26 +0100 |
| commit | 35e8283c69d80debb44b05ea79dc5f67303a7432 (patch) | |
| tree | aacfe7f201094793c3d29ec0ddcc71cb01f7476c /progs/xdemos/glxdemo.c | |
| parent | 00b463fc30b30911797c5d5eaaeae79b7a36589b (diff) | |
| parent | 420ff89067515a74c9625a103cadc267d5f64bd4 (diff) | |
Merge branch 'gallium-edgeflags'
Conflicts:
src/mesa/state_tracker/st_draw.c
Diffstat (limited to 'progs/xdemos/glxdemo.c')
0 files changed, 0 insertions, 0 deletions