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
..
2014-01-04 15:02:52 +04:00
2014-01-04 18:34:53 +01:00
2013-12-10 13:41:20 +01:00
2014-01-02 18:28:13 +00:00
2013-08-28 21:20:56 +02:00
2013-12-21 02:28:26 +02:00
2013-12-29 10:01:22 +01:00
2014-01-04 18:34:53 +01:00
2014-01-02 16:35:05 +01:00
2013-09-28 19:44:52 +08:00
2014-01-04 18:34:53 +01:00
2014-01-04 18:34:53 +01:00
2013-12-03 22:23:21 +01:00
2013-12-19 17:20:53 +01:00
2013-12-23 17:42:20 +01:00
2013-12-29 10:01:22 +01:00
2013-12-31 12:25:44 +01:00
2013-12-21 02:28:26 +02:00
2013-06-25 14:12:16 +02:00
2013-12-25 23:56:41 +01:00