summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorKeith Whitwell <keithw@vmware.com>2009-12-22 09:40:39 +0000
committerKeith Whitwell <keithw@vmware.com>2009-12-22 09:40:39 +0000
commit8408075071db03e70d69a84a3e2d36d034b309ca (patch)
tree3af4acc1c0d93793b5205de9b449024424fc3e3a /Makefile
parent6f8f910b37370048c9bf72986f163e08e9fe228b (diff)
parente1ef4fe55e614baa650056c16cfd76fb95b71ef4 (diff)
downloadmesa-demos-8408075071db03e70d69a84a3e2d36d034b309ca.tar.gz
Merge branch 'i965g-restart'
Conflicts: configure.ac
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index ace4006d..eb8dcc12 100644
--- a/Makefile
+++ b/Makefile
@@ -105,6 +105,7 @@ irix6-n32-static \
irix6-o32 \
irix6-o32-static \
linux \
+linux-i965 \
linux-alpha \
linux-alpha-static \
linux-cell \