diff options
| author | Dave Airlie <airlied@redhat.com> | 2007-10-12 11:02:46 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2007-10-12 11:02:46 +1000 |
| commit | bf805d3bf5bf191aa669b6155316a78917cf9b0e (patch) | |
| tree | d76223fb22381485f7ecc8f6c7d026dcd88d80f3 /progs/xdemos/.gitignore | |
| parent | 9e06cf00cfb24528653913fc90eded4d370c1149 (diff) | |
| parent | 72c888869f4e5074e57c349ec356798959be791e (diff) | |
Merge branch 'master' into i915-superioctl
Diffstat (limited to 'progs/xdemos/.gitignore')
| -rw-r--r-- | progs/xdemos/.gitignore | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/progs/xdemos/.gitignore b/progs/xdemos/.gitignore index f959ef26ec..250bc17d98 100644 --- a/progs/xdemos/.gitignore +++ b/progs/xdemos/.gitignore @@ -5,14 +5,14 @@ glxgears glxgears_fbconfig glxheads glxinfo -glxpixmap glxpbdemo +glxpixmap glxswapcontrol manywin offset overlay -pbinfo pbdemo +pbinfo texture_from_pixmap wincopy xdemo |