Module: Mesa Branch: master Commit: edfbf7dccb1d90ebedfa08fe06e1db7fff9f94d4 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=edfbf7dccb1d90ebedfa08fe06e1db7fff9f94d4
Author: Brian Paul <bri...@vmware.com>
Date: Mon May 18 10:36:50 2009 -0600
Merge branch 'mesa_7_5_branch'
Conflicts:
Makefile
src/mesa/main/version.h
---
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
