| commit | 5be25443dd91ad34474e965f5c65ec0d180b139e | [log] [tgz] |
|---|---|---|
| author | Brice Goglin <bgoglin@debian.org> | Mon Jan 11 17:52:13 2010 +0100 |
| committer | Brice Goglin <bgoglin@debian.org> | Mon Jan 11 17:52:13 2010 +0100 |
| tree | 90f46db8c7ecb182a27b1c342f934549127b1ff7 | |
| parent | eb1cc8273b6b46578e5ca13b19800f800f08c550 [diff] | |
| parent | 53d395336d87b2e3c30a413bd52c7abc94bd1bd7 [diff] |
Merge branch 'debian-unstable' of git+ssh://git.debian.org/git/pkg-xorg/lib/mesa into debian-experimental Conflicts: ChangeLog debian/changelog