OSDN Git Service

Merge branch 'mesa_7_5_branch'
authorBrian Paul <brianp@vmware.com>
Mon, 18 May 2009 16:36:50 +0000 (10:36 -0600)
committerBrian Paul <brianp@vmware.com>
Mon, 18 May 2009 16:36:50 +0000 (10:36 -0600)
commitedfbf7dccb1d90ebedfa08fe06e1db7fff9f94d4
tree0e224de2fac2fc5c632b2398a372b658c66a36d7
parent27206add2738f9813d1e9f42fe3b1bdfbd9b8aa4
parent7ce105d2e6885eeac73c59dc14c4cd59a89c1425
Merge branch 'mesa_7_5_branch'

Conflicts:

Makefile
src/mesa/main/version.h
Makefile
docs/relnotes.html
src/mesa/main/mipmap.c