diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-19 16:56:04 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-19 16:56:04 +0100 |
| commit | f60d60e8ed05d959191489c38d0a54f66d9e8b97 (patch) | |
| tree | f88e0e1fab19fd2ce66890d6b163485db3dbdf06 /debian/patches/series | |
| parent | 4aabe7e914ddcf1b4109fa96381a920ea5a097c9 (diff) | |
| parent | da6adddc287a5fb95d2aaad699dcd46d13d2db0a (diff) | |
Merge branch 'master' of git.debian.org:/git/pkg-hurd/gnumach
Conflicts:
debian/patches/10_cdromlock.patch
debian/patches/13_ide_dma.patch
debian/patches/24_pci_irq_fix.patch
Diffstat (limited to 'debian/patches/series')
| -rw-r--r-- | debian/patches/series | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/debian/patches/series b/debian/patches/series index e8eb4db..8433870 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,9 +1,6 @@ 00_clean_gfdl.patch -10_cdromlock.patch 11_ignore_CSIn.patch 12_version_suffix.patch -13_ide_dma.patch -24_pci_irq_fix.patch 50_initrd.patch 60_bigmem.patch 70_dde.patch |