Vladimír Čunát
e740b565cf
Merge master into stdenv-updates
Conflicts (easy):
pkgs/development/compilers/llvm/default.nix
pkgs/development/compilers/openjdk/default.nix
pkgs/development/libraries/icu/default.nix
pkgs/development/libraries/libssh/default.nix
pkgs/development/libraries/libxslt/default.nix
pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
..
2013-12-18 18:18:27 +02:00
2013-08-27 04:39:33 +02:00
2013-12-10 00:25:54 +01:00
2013-10-08 11:07:14 +02:00
2012-03-07 22:20:23 +00:00
2013-12-18 18:18:25 +02:00
2013-09-12 12:22:17 +02:00
2012-06-22 14:36:11 -04:00
2013-12-23 22:30:43 +01:00
2013-08-16 23:45:01 +02:00
2013-05-20 11:17:20 +04:00
2010-06-22 19:49:06 +00:00
2013-12-29 10:01:22 +01:00
2013-06-04 07:50:59 +02:00
2013-12-25 14:43:23 +01:00
2013-12-29 10:01:22 +01:00
2013-10-02 05:17:32 +00:00
2013-12-14 17:59:57 +02:00
2013-02-05 20:35:39 +01:00
2013-06-20 09:21:25 -04:00
2013-11-25 10:59:37 +04:00
2013-12-16 04:50:22 +00:00