diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-09-28 10:30:03 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-09-28 10:32:18 +0000 |
| commit | c037c23ef09fbe981d8663a6e9644ae1717e1649 (patch) | |
| tree | d614ccb3a56cb15b0febb0e04e9c8f37614fee36 /debian/patches/series | |
| parent | 6636367748db8d68bf9d699e70c44d641f235d0f (diff) | |
| parent | 80cddc9ba64d1f4a82449680e4adc52918177d1f (diff) | |
Merge branch 'upstream'
Conflicts:
doc/gpl.texi
doc/mach.texi
Diffstat (limited to 'debian/patches/series')
| -rw-r--r-- | debian/patches/series | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/debian/patches/series b/debian/patches/series index 8433870..a95f927 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -00_clean_gfdl.patch 11_ignore_CSIn.patch 12_version_suffix.patch 50_initrd.patch |