Merge branch 'master' of git+ssh://znh@git.freedesktop.org/git/mesa/mesa
authorZou Nan hai <nanhai.zou@intel.com>
Thu, 25 Jan 2007 23:05:02 +0000 (07:05 +0800)
committerZou Nan hai <nanhai.zou@intel.com>
Thu, 25 Jan 2007 23:05:02 +0000 (07:05 +0800)
commitc6c65e7b22f8b64efa45887b7808260248a5f384
tree2b167d1121dae6a974f6ffd4eea195a321e0c470
parent6aa62ba43f64f617c608e52b63c7eaa7aae16fb4
parentd5db167c2cf9243c3153efb29582df72d819e7ac
Merge branch 'master' of git+ssh://znh@git.freedesktop.org/git/mesa/mesa