diff options
| author | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-09-11 10:51:46 +0200 |
|---|---|---|
| committer | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-09-11 10:53:31 +0200 |
| commit | 1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304 (patch) | |
| tree | 3513b616eec434d455177a877119cdd96a7b4ade /pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch | |
| parent | 2d405ed4d54ba4d924b5146cea4a39ae65343d59 (diff) | |
| parent | aa8e8303e1b42c5cf5195f3ce82f886664aa26d4 (diff) | |
| download | nixlib-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar nixlib-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar.gz nixlib-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar.bz2 nixlib-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar.lz nixlib-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar.xz nixlib-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar.zst nixlib-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.zip | |
Merge remote-tracking branch 'official/master' into multiple-outputs
Conflicts: pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/freetype/default.nix pkgs/development/libraries/glib/default.nix pkgs/development/libraries/libpng/default.nix pkgs/development/libraries/pango/default.nix pkgs/tools/typesetting/tex/texlive/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch')
0 files changed, 0 insertions, 0 deletions