summaryrefslogtreecommitdiffstats
path: root/debian/libosmesa6.shlibs
diff options
context:
space:
mode:
authorBrice Goglin <[email protected]>2010-01-11 17:52:13 +0100
committerBrice Goglin <[email protected]>2010-01-11 17:52:13 +0100
commit5be25443dd91ad34474e965f5c65ec0d180b139e (patch)
tree90f46db8c7ecb182a27b1c342f934549127b1ff7 /debian/libosmesa6.shlibs
parenteb1cc8273b6b46578e5ca13b19800f800f08c550 (diff)
parent53d395336d87b2e3c30a413bd52c7abc94bd1bd7 (diff)
Merge branch 'debian-unstable' of git+ssh://git.debian.org/git/pkg-xorg/lib/mesa into debian-experimental
Conflicts: ChangeLog debian/changelog
Diffstat (limited to 'debian/libosmesa6.shlibs')
0 files changed, 0 insertions, 0 deletions