Vladimír Čunát
96cec2a7bd
Merge 'staging' into multiple-outputs
Conflicts:
pkgs/applications/audio/flac/default.nix
pkgs/build-support/gcc-wrapper/builder.sh
pkgs/development/libraries/apr-util/default.nix
pkgs/development/libraries/apr/default.nix
pkgs/development/libraries/atk/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/glibc/2.17/builder.sh
pkgs/development/libraries/glibc/2.17/locales.nix
pkgs/development/libraries/libjpeg/default.nix
pkgs/development/libraries/libogg/default.nix
pkgs/development/libraries/libsamplerate/default.nix
pkgs/development/libraries/libtiff/default.nix
pkgs/development/libraries/libvorbis/default.nix
pkgs/development/libraries/mesa/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/development/web/nodejs/default.nix
pkgs/os-specific/linux/pam/default.nix
pkgs/os-specific/linux/systemd/default.nix
pkgs/stdenv/generic/setup.sh
pkgs/stdenv/linux/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
..
2014-02-15 12:03:02 +01:00
2014-07-28 20:52:47 +02:00
2014-02-15 12:03:02 +01:00
2013-12-13 20:56:36 +02:00
2014-07-28 20:52:47 +02:00
2014-04-08 13:25:16 +02:00
2008-06-02 08:21:38 +00:00
2013-08-26 12:04:56 +02:00
2014-07-28 11:31:14 +02:00
2009-03-11 13:34:18 +00:00
2013-02-26 01:24:32 +01:00
2014-04-22 16:27:28 +02:00
2010-11-27 20:54:35 +00:00
2013-01-16 13:59:15 -05:00
2011-10-07 12:18:17 +00:00
2013-06-02 23:33:27 +02:00
2011-10-27 21:45:53 +00:00
2011-10-20 18:17:37 +00:00
2011-08-10 13:05:39 +00:00
2013-08-29 07:28:33 -04:00