summaryrefslogtreecommitdiffstats
path: root/progs/xdemos/.gitignore
diff options
context:
space:
mode:
authorRoland Scheidegger <sroland@vmware.com>2010-02-09 19:32:21 +0100
committerRoland Scheidegger <sroland@vmware.com>2010-02-09 19:32:21 +0100
commit653a83445f94620673f747a4ace6847a2c7fdb4d (patch)
treee2c6814da8d809813daffce530b37f3d283e96ff /progs/xdemos/.gitignore
parentb0613d87672ea08bb3b9cd56dee714fe413b670e (diff)
parentdd7be07c9685012b3e9fdfbaa13dc638abf6a9d1 (diff)
Merge branch 'gallium-nopointsizeminmax'
Conflicts: src/gallium/drivers/nv10/nv10_state.c src/gallium/drivers/nv20/nv20_state.c src/gallium/drivers/nv50/nv50_program.c
Diffstat (limited to 'progs/xdemos/.gitignore')
0 files changed, 0 insertions, 0 deletions