Module: Mesa
Branch: master
Commit: e5c7d1e1c8ccb493c63e33d017c28b5cf4a55829
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=e5c7d1e1c8ccb493c63e33d017c28b5cf4a55829
Author: Michel Dänzer <daen...@vmware.com>
Date: Tue Mar 30 12:01:31 2010 +0200
Merge branch '7.8'
Conflicts:
Makefile
src/mesa/main/version.h
Resolved by keeping version strings from master (also in the intel driver).
---
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
