Mathijs Kwik 1a55c4b89f Merge remote-tracking branch 'official/master' into multiple-outputs ...

Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/tools/typesetting/tex/texlive/default.nix
	pkgs/top-level/all-packages.nix

2013-09-11 10:53:31 +02:00

..

applications

Merge remote-tracking branch 'official/master' into multiple-outputs

2013-09-11 10:53:31 +02:00

build-support

…

data

…

desktops

Merge branch 'master' into x-updates

2013-09-08 12:04:20 +02:00

development

Merge remote-tracking branch 'official/master' into multiple-outputs

2013-09-11 10:53:31 +02:00

games

beret: Fix build on darwin (close #923)

2013-09-08 10:32:25 +02:00

lib

Merge branch 'x-updates' into master

2013-09-11 08:37:03 +02:00

misc

Merge remote-tracking branch 'official/master' into multiple-outputs

2013-09-11 10:53:31 +02:00

os-specific

Merge remote-tracking branch 'official/master' into multiple-outputs

2013-09-11 10:53:31 +02:00

servers

Merge remote-tracking branch 'official/master' into multiple-outputs

2013-09-11 10:53:31 +02:00

shells

zsh: Upgrade to 5.0.2

2013-09-01 16:46:21 +02:00

stdenv

…

test

…

tools

Merge remote-tracking branch 'official/master' into multiple-outputs

2013-09-11 10:53:31 +02:00

top-level

Merge remote-tracking branch 'official/master' into multiple-outputs

2013-09-11 10:53:31 +02:00