diff options
author | martin f. krafft <madduck@debian.org> | 2009-05-05 12:05:50 +0200 |
---|---|---|
committer | martin f. krafft <madduck@debian.org> | 2009-05-05 12:05:50 +0200 |
commit | 104c24eb5f8b501167e48dc57794d689ca0d78b9 (patch) | |
tree | e64d5c0d8c4f347e90d28ac8c5e33d971a51e881 /debian/patches/series | |
parent | bb1ff5ef710c4c0c080339e918c7a1a851929194 (diff) | |
parent | 2800528713cd32a4d12d7e17c14eba34eb8a4ec2 (diff) |
Merge branch 'devel-3.0' into debian/experimental
Conflicts:
.gitignore
Diffstat (limited to 'debian/patches/series')
0 files changed, 0 insertions, 0 deletions