Vladimír Čunát
9443129b08
Merge master into stdenv-updates
Conflicts:
pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
pkgs/top-level/all-packages.nix (auto-solved)
2014-01-04 18:34:53 +01:00
..
2013-06-25 14:12:16 +02:00
2013-12-18 18:18:16 +02:00
2014-01-03 11:49:38 +01:00
2014-01-02 18:31:09 +00:00
2012-07-25 23:18:40 -04:00
2013-02-21 12:03:52 +01:00
2013-12-10 01:07:30 +02:00
2013-10-26 18:28:05 +02:00
2013-07-14 03:09:34 +03:00
2012-01-18 20:16:00 +00:00
2013-09-07 01:25:30 +04:00
2013-02-28 15:43:06 +01:00
2012-01-18 20:16:00 +00:00
2013-10-20 21:10:25 +04:00
2013-03-09 12:27:38 +01:00
2013-12-16 01:36:16 +02:00
2013-12-10 14:28:19 +01:00
2013-01-28 17:27:14 +01:00
2012-09-16 22:41:32 +02:00
2013-08-16 23:45:01 +02:00
2013-12-23 11:10:18 +01:00
2013-10-07 17:36:47 +02:00
2013-06-15 20:47:47 +02:00
2013-01-15 18:53:12 +01:00
2013-04-12 15:27:13 +02:00
2012-05-12 23:11:00 +00:00
2013-06-15 20:47:47 +02:00
2013-12-14 00:46:44 +02:00
2013-11-04 21:11:00 +01:00
2013-12-05 14:42:16 +04:00