summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-05-18 10:36:50 -0600
committerBrian Paul <brianp@vmware.com>2009-05-18 10:36:50 -0600
commitedfbf7dccb1d90ebedfa08fe06e1db7fff9f94d4 (patch)
tree0e224de2fac2fc5c632b2398a372b658c66a36d7 /Makefile
parent27206add2738f9813d1e9f42fe3b1bdfbd9b8aa4 (diff)
parent7ce105d2e6885eeac73c59dc14c4cd59a89c1425 (diff)
Merge branch 'mesa_7_5_branch'
Conflicts: Makefile src/mesa/main/version.h
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 4796125f10..146c52093b 100644
--- a/Makefile
+++ b/Makefile
@@ -127,6 +127,7 @@ linux-icc \
linux-icc-static \
linux-llvm \
linux-osmesa \
+linux-osmesa-static \
linux-osmesa16 \
linux-osmesa16-static \
linux-osmesa32 \