Vladimír Čunát ac6761c908 Merge master into stdenv-updates ...

Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix

2014-01-20 19:39:28 +01:00

..

darwin

darwin x11/opengl: only copy subset of files (close #1165)

2013-11-07 10:39:28 +01:00

gnu

More renames

2012-12-28 19:42:10 +01:00

linux

Merge master into stdenv-updates

2014-01-20 19:39:28 +01:00

windows

pthread-win32: don't propagate `mingw_headers'

2013-03-29 21:46:38 +01:00