diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-09-13 19:48:47 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-09-13 19:48:47 -0400 |
| commit | 9fac9e3be3925713c20f1d5ff8b35353af10baa2 (patch) | |
| tree | 9add6e882007184cc420b2e26d620de0982d934a /gnu-system.am | |
| parent | 9d77da2a47ddb707edcbd1ca17f5c0ac3c068b04 (diff) | |
| parent | d7ab698a620873c11103fa2bd082884f0198723a (diff) | |
Merge branch 'master' into core-updates
Conflicts:
gnu-system.am
Diffstat (limited to 'gnu-system.am')
| -rw-r--r-- | gnu-system.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gnu-system.am b/gnu-system.am index dbdaf53d6f6..93afd9fb509 100644 --- a/gnu-system.am +++ b/gnu-system.am | |||
| @@ -320,6 +320,7 @@ dist_patch_DATA = \ | |||
| 320 | gnu/packages/patches/doxygen-test.patch \ | 320 | gnu/packages/patches/doxygen-test.patch \ |
| 321 | gnu/packages/patches/doxygen-tmake.patch \ | 321 | gnu/packages/patches/doxygen-tmake.patch \ |
| 322 | gnu/packages/patches/emacs-configure-sh.patch \ | 322 | gnu/packages/patches/emacs-configure-sh.patch \ |
| 323 | gnu/packages/patches/eudev-rules-directory.patch \ | ||
| 323 | gnu/packages/patches/file-CVE-2014-3587.patch \ | 324 | gnu/packages/patches/file-CVE-2014-3587.patch \ |
| 324 | gnu/packages/patches/findutils-absolute-paths.patch \ | 325 | gnu/packages/patches/findutils-absolute-paths.patch \ |
| 325 | gnu/packages/patches/flashrom-use-libftdi1.patch \ | 326 | gnu/packages/patches/flashrom-use-libftdi1.patch \ |