Peter Simons 4914e63a89 Merge changes from branch 'master' into stdenv-updates. ... Conflicts: pkgs/development/libraries/icu/default.nix pkgs/tools/misc/coreutils/default.nix		2013-04-19 11:48:11 +02:00
..
applications	Merge changes from branch 'master' into stdenv-updates.	2013-04-19 11:48:11 +02:00
build-support	Merge changes from branch 'master' into stdenv-updates.	2013-04-19 11:48:11 +02:00
data	man-pages: Update to 3.50	2013-03-27 23:00:02 +01:00
desktops	add terminology: e17 terminal emulator	2013-04-04 22:18:08 +02:00
development	Merge changes from branch 'master' into stdenv-updates.	2013-04-19 11:48:11 +02:00
games	Merge changes from branch 'master' into stdenv-updates.	2013-04-19 11:48:11 +02:00
lib	pythonPackages.buildout: update to 1.7.1 and also:	2013-04-17 01:25:45 +02:00
misc	Add sha256 hash to winetricks.	2013-03-30 20:00:05 +01:00
os-specific	Update Linux 3.8	2013-04-18 19:22:54 +04:00
servers	xorg-server: fix CVE-1940	2013-04-18 12:50:26 +02:00
shells	bash-completion: update to version 2.1	2013-04-10 17:39:09 +02:00
stdenv	Merge changes from branch 'master' into stdenv-updates.	2013-04-19 11:48:11 +02:00
test
tools	Merge changes from branch 'master' into stdenv-updates.	2013-04-19 11:48:11 +02:00
top-level	Merge changes from branch 'master' into stdenv-updates.	2013-04-19 11:48:11 +02:00