diff options
| author | Julien Cristau <[email protected]> | 2008-07-13 19:20:03 +0200 |
|---|---|---|
| committer | Julien Cristau <[email protected]> | 2008-07-13 19:20:03 +0200 |
| commit | 64e57ed257c559ea31cf162c67a7ef61fdc562e4 (patch) | |
| tree | dee99970e9d1e6d892f21db31488470bc7929d18 /debian/patches/04_osmesa_version.diff | |
| parent | dabd09f5a92e5497ac6ac9b4ba26f806ddb25206 (diff) | |
| parent | 4fab47b13c214dc79e0ae5d8001521029ce34231 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/git/mesa/mesa into debian-experimental
Conflicts:
progs/tests/antialias.c
progs/tools/trace/Makefile
Diffstat (limited to 'debian/patches/04_osmesa_version.diff')
0 files changed, 0 insertions, 0 deletions