diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-01-11 15:23:29 -0500 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-01-11 15:23:29 -0500 |
| commit | c6ef705e414c8e93ee471f50d15ada3492a9b067 (patch) | |
| tree | 5b037def16eaa6e58860f7b66d79fd75067a0cb2 /progs/xdemos/.gitignore | |
| parent | cca66dbb59673168d57b4e3499ccc31f4ddc86ad (diff) | |
| parent | 7c50d29f7ced3d60e52ee0146d982b49ea421de2 (diff) | |
Merge branch 'master' of ssh://people.freedesktop.org/~jbarnes/mesa
Conflicts due to DRI1 removal:
src/mesa/drivers/dri/intel/intel_context.c
src/mesa/drivers/dri/intel/intel_screen.c
Diffstat (limited to 'progs/xdemos/.gitignore')
| -rw-r--r-- | progs/xdemos/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/progs/xdemos/.gitignore b/progs/xdemos/.gitignore index 1b9b3a87c0..5ae0f5a062 100644 --- a/progs/xdemos/.gitignore +++ b/progs/xdemos/.gitignore @@ -26,3 +26,4 @@ xdemo xfont xrotfontdemo yuvrect_client +msctest |