Eelco Dolstra 7f410ef923 Merge remote-tracking branch 'origin/master' into staging ...

Conflicts:
	pkgs/misc/vim-plugins/default.nix

2014-07-22 11:00:00 +02:00

..

applications

Merge remote-tracking branch 'origin/master' into staging

2014-07-22 11:00:00 +02:00

build-support

Merge remote-tracking branch 'origin/master' into staging

2014-07-22 11:00:00 +02:00

data

Merge remote-tracking branch 'origin/master' into staging

2014-07-14 17:04:55 +02:00

desktops

Merge remote-tracking branch 'origin/master' into staging

2014-07-22 11:00:00 +02:00

development

Merge remote-tracking branch 'origin/master' into staging

2014-07-22 11:00:00 +02:00

games

Merge remote-tracking branch 'origin/master' into staging

2014-07-14 17:04:55 +02:00

misc

Merge remote-tracking branch 'origin/master' into staging

2014-07-22 11:00:00 +02:00

os-specific

Merge remote-tracking branch 'origin/master' into staging

2014-07-22 11:00:00 +02:00

servers

Merge remote-tracking branch 'origin/master' into staging

2014-07-22 11:00:00 +02:00

shells

Merge remote-tracking branch 'origin/master' into staging

2014-07-22 11:00:00 +02:00

stdenv

Set MACOSX_DEPLOYMENT_TARGET

2014-07-02 19:52:25 +02:00

test

…

tools

Merge remote-tracking branch 'origin/master' into staging

2014-07-22 11:00:00 +02:00

top-level

Merge remote-tracking branch 'origin/master' into staging

2014-07-22 11:00:00 +02:00