Eelco Dolstra cd71f7a2e6 Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging
Conflicts:
	pkgs/development/interpreters/ruby/ruby-19.nix
	pkgs/development/libraries/libc++/default.nix
	pkgs/development/libraries/libc++abi/default.nix
	pkgs/tools/text/sgml/opensp/default.nix
2014-09-23 11:27:53 +02:00
..
2014-09-13 21:48:29 +02:00
2014-05-18 20:51:08 -07:00
2014-07-22 11:01:32 +02:00
2014-07-22 11:01:32 +02:00
2014-08-24 22:31:37 +02:00
2014-05-31 15:49:13 +02:00
2014-09-13 10:04:37 +02:00
2014-07-22 11:01:32 +02:00
2014-08-24 22:31:37 +02:00
2014-07-14 15:35:27 +02:00
2014-06-30 12:48:38 +02:00
2014-05-31 15:49:13 +02:00
2014-08-31 18:20:07 +04:00
2014-08-24 22:31:37 +02:00
2014-09-13 21:48:29 +02:00