diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-11-02 14:46:49 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-11-02 14:46:49 +0000 |
| commit | dd1164c7a26e411c59154f0560717315b22bb014 (patch) | |
| tree | 5b498768c142363b52e6389435ea0e9afc48b6b2 /libmachdev | |
| parent | c27d9c3c97b18cb34a5997beb73b3740a1c010b1 (diff) | |
| parent | fd94033385441884a1602c2fa3b5597d5d8245d5 (diff) | |
Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd
Conflicts:
debian/changelog
debian/control
Diffstat (limited to 'libmachdev')
0 files changed, 0 insertions, 0 deletions