diff options
| author | Brice Goglin <[email protected]> | 2007-11-11 00:24:52 +0100 |
|---|---|---|
| committer | Brice Goglin <[email protected]> | 2007-11-11 00:24:52 +0100 |
| commit | 11c827c588cdf053960e72e789cce0adb1157517 (patch) | |
| tree | 39589e58da506e2d3e23d46720a136b08d3273ac /progs/fbdev | |
| parent | 8913402b749695ac163f6247e7ad3a06b5b5aa0c (diff) | |
| parent | 8a40b670c3babc31f96d08bce16fe10eb718fa8f (diff) | |
Merge tag 'mesa_7_0_2' into debian-unstable
Conflicts:
.gitignore
progs/demos/.gitignore
progs/directfb/Makefile
progs/egl/Makefile
progs/fbdev/Makefile
progs/fp/Makefile
progs/miniglx/Makefile
progs/samples/.gitignore
progs/slang/Makefile
progs/tests/.gitignore
progs/tests/Makefile
progs/tools/trace/Makefile
progs/trivial/Makefile
progs/vp/Makefile
progs/xdemos/.gitignore
src/egl/drivers/demo/Makefile
src/egl/drivers/dri/Makefile
src/egl/main/Makefile
src/glu/mesa/Makefile
src/glut/directfb/Makefile
src/glx/mini/Makefile
Diffstat (limited to 'progs/fbdev')
| -rw-r--r-- | progs/fbdev/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/progs/fbdev/.gitignore b/progs/fbdev/.gitignore new file mode 100644 index 00000000000..b9ddf559fd5 --- /dev/null +++ b/progs/fbdev/.gitignore @@ -0,0 +1 @@ +glfbdevtest |