diff options
| author | Julien Cristau <jcristau@debian.org> | 2008-01-14 22:30:03 +0100 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2008-01-14 22:30:03 +0100 |
| commit | c04885f0720fef858355827022213d998bb56381 (patch) | |
| tree | 63528ea6483b9c9dac5270b44c491546da24b2aa /debian/control | |
| parent | 9fd22f0e3f50b64c925b5ba6c15f97a587bdd8c5 (diff) | |
| parent | 48ae5cf09d733497519328d513c4176bfa1c8fc0 (diff) | |
Merge branch 'mesa_7_0_branch' of git://anongit.freedesktop.org/git/mesa/mesa into debian-unstable
Conflicts:
progs/tests/.gitignore
progs/tests/Makefile
Diffstat (limited to 'debian/control')
0 files changed, 0 insertions, 0 deletions