summaryrefslogtreecommitdiff
path: root/progs/xdemos
diff options
context:
space:
mode:
authorMichel Dänzer <michel@tungstengraphics.com>2008-05-21 17:15:07 +0100
committerMichel Dänzer <michel@tungstengraphics.com>2008-05-21 17:15:07 +0100
commit019fc3aa04f11d61e6d0f4791c171d1790577ab5 (patch)
tree3a9cd284d00910388876b8d08d20bfc7f3faa841 /progs/xdemos
parentbf7519b0a40d18a1cc764357f18df59979604129 (diff)
parente8d5be9c76b08ba423e3c635aae5178f2358169a (diff)
Merge branch 'gallium-0.1' into gallium-tex-surfaces
Diffstat (limited to 'progs/xdemos')
-rw-r--r--progs/xdemos/.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/progs/xdemos/.gitignore b/progs/xdemos/.gitignore
index 250bc17d98..34551101cb 100644
--- a/progs/xdemos/.gitignore
+++ b/progs/xdemos/.gitignore
@@ -13,6 +13,7 @@ offset
overlay
pbdemo
pbinfo
+sharedtex
texture_from_pixmap
wincopy
xdemo