Domen Kožar 4aa3eec330 Merge branch 'master' into staging ...

Conflicts:
	pkgs/development/libraries/fontconfig/default.nix

2014-12-07 14:02:48 +01:00

..

darwin

fixes #1933

2014-10-23 00:14:09 +02:00

gnu

gnu: Fix (evaluation of the) call to forceSystem.

2014-07-28 20:46:32 +02:00

linux

Merge branch 'master' into staging

2014-12-07 14:02:48 +01:00

windows

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00