Eelco Dolstra f33fa1b66b Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/boost/generic.nix		2014-11-11 23:48:08 +01:00
..
1.55.nix	boost: Pass arguments to generic.nix	2014-11-03 11:14:08 -08:00
1.56.nix	boost: Pass arguments to generic.nix	2014-11-03 11:14:08 -08:00
boost-155-clang.patch	fix boost build with clang	2014-09-09 13:54:26 -07:00
generic.nix	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00