Peter Simons 6b1ebeccf2 Merge branch 'master' into stdenv-updates. ... There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix, which I resolved to the best of my knowledge. I'd appreciate if some of the ruby gurus could have a look at the outcome of my merge, though.		2013-06-11 12:11:25 +02:00
..
applications	Merge branch 'master' into stdenv-updates.	2013-06-11 12:11:25 +02:00
build-support	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-06-01 11:48:21 +02:00
data	Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions.	2013-06-07 03:15:45 +03:00
desktops	KDE 4.10: update to 4.10.4	2013-06-05 19:41:28 +03:00
development	Merge branch 'master' into stdenv-updates.	2013-06-11 12:11:25 +02:00
games	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-05-22 12:30:02 +02:00
lib	adding unfree-redistributable-firmware	2013-06-05 22:44:17 +02:00
misc	Merge pull request #568 from MarcWeber/submit/vim-multiple-version-and-plugins	2013-06-10 23:06:56 -07:00
os-specific	linux-3.9: upgrade to 3.9.5	2013-06-10 08:36:04 +02:00
servers	bind: avoid build impurity by explicitly enabling/disabling features	2013-06-10 15:38:00 +02:00
shells	fish: Add fish 2.0.0	2013-06-04 10:20:30 +01:00
stdenv	linux/bootstrap: Use <nix/fetchurl> to get the static binaries	2013-05-05 11:30:34 -04:00
test
tools	Merge branch 'master' into stdenv-updates.	2013-06-11 12:11:25 +02:00
top-level	Merge branch 'master' into stdenv-updates.	2013-06-11 12:11:25 +02:00