Eelco Dolstra
99b88cfb53
Merge remote-tracking branch 'origin/master' into multiple-outputs
Conflicts:
pkgs/development/libraries/acl/default.nix
pkgs/development/libraries/atk/2.6.x.nix
pkgs/development/libraries/attr/default.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/glib/2.34.x.nix
pkgs/development/libraries/gtk+/2.24.x.nix
pkgs/development/libraries/libtiff/default.nix
pkgs/development/libraries/openssl/default.nix
pkgs/development/libraries/pango/1.30.x.nix
pkgs/misc/cups/default.nix
pkgs/os-specific/linux/util-linux/default.nix
pkgs/servers/x11/xorg/builder.sh
pkgs/servers/x11/xorg/default.nix
pkgs/top-level/all-packages.nix
2013-06-09 00:41:27 +02:00
..
2013-06-07 03:15:45 +03:00
2012-08-10 15:02:19 +02:00
2013-05-30 12:12:19 +02:00
2012-12-13 17:51:03 +01:00
2012-03-07 22:20:23 +00:00
2013-05-11 00:36:59 +02:00
2013-06-05 22:16:24 +02:00
2012-06-22 14:36:11 -04:00
2013-06-05 12:17:36 +02:00
2009-07-27 10:43:20 +00:00
2013-05-20 11:17:20 +04:00
2010-06-22 19:49:06 +00:00
2013-06-09 00:41:27 +02:00
2013-06-04 07:50:59 +02:00
2013-03-15 12:41:01 +01:00
2013-05-11 00:36:59 +02:00
2013-01-13 11:33:45 +01:00
2013-02-23 23:49:48 +01:00
2013-02-05 20:35:39 +01:00
2013-02-26 00:41:10 +01:00