diff options
| author | Keith Packard <keithp@keithp.com> | 2008-06-03 22:56:25 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2008-06-03 22:56:25 -0700 |
| commit | dbf3c5247c90bd35c0b2002e3b972a2dd4c8b130 (patch) | |
| tree | dd986e993f20f78999fc15c304289656878ffcae /progs/xdemos/.gitignore | |
| parent | 4b5b008d54e86ac4f0a2176429d062100978ca8c (diff) | |
| parent | 0b734bd7cf921592eee441f759687e10f48a2cbc (diff) | |
Merge commit 'origin/master' into drm-gem
Conflicts:
src/mesa/drivers/dri/common/dri_bufmgr.h
src/mesa/drivers/dri/intel/intel_bufmgr_ttm.c
src/mesa/drivers/dri/intel/intel_bufmgr_ttm.h
src/mesa/drivers/dri/intel/intel_ioctl.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 23e7c3ea18..868249db88 100644 --- a/progs/xdemos/.gitignore +++ b/progs/xdemos/.gitignore @@ -16,6 +16,7 @@ offset overlay pbdemo pbinfo +sharedtex texture_from_pixmap wincopy xdemo |