| commit | 4df482086ebf0663c708b089d8d8d22de0ef972c | [log] [tgz] |
|---|---|---|
| author | Alan Hourihane <alanh@vmware.com> | Thu Jan 22 09:43:42 2009 +0000 |
| committer | Alan Hourihane <alanh@vmware.com> | Thu Jan 22 09:43:42 2009 +0000 |
| tree | e802cc36b266bfdeb80ab9e55643c50f5a5e6d9c | |
| parent | 01cbd764962ff49bf104e5997914ced53360ef81 [diff] | |
| parent | b8bd0b0ddc357f9b430bb6ddeb60c5a2179d3791 [diff] |
Merge commit 'origin/master' into gallium-0.2 Conflicts: windows/VC8/mesa/osmesa/osmesa.vcproj windows/VC8/progs/demos/gears.vcproj windows/VC8/progs/progs.sln