Domen Kožar bb4d658f64 Merge branch 'master' into staging ...

Conflicts:
	nixos/doc/manual/release-notes/rl-unstable.xml
	nixos/modules/services/printing/cupsd.nix
	pkgs/applications/misc/calibre/default.nix
	pkgs/development/haskell-modules/hackage-packages.nix
	pkgs/development/libraries/libsodium/default.nix
	pkgs/misc/emulators/wine/unstable.nix
	pkgs/top-level/all-packages.nix

2015-05-11 10:05:23 +02:00

..

applications

Merge branch 'master' into staging

2015-05-11 10:05:23 +02:00

build-support

Merge branch 'master' into staging

2015-05-08 05:59:50 -07:00

data

man-pages 3.83 -> 4.00

2015-05-10 13:46:02 +02:00

desktops

kde4.kopete: fix build

2015-05-07 21:49:54 -05:00

development

Merge branch 'master' into staging

2015-05-11 10:05:23 +02:00

games

Update LiquidWar

2015-05-10 13:46:31 +02:00

misc

Merge branch 'master' into staging

2015-05-11 10:05:23 +02:00

os-specific

Merge branch 'master' into staging

2015-05-11 10:05:23 +02:00

servers

Update Nginx

2015-05-10 13:46:30 +02:00

shells

…

stdenv

Merge pull request #7740 from dezgeg/arm

2015-05-07 20:53:07 +02:00

test

…

tools

Update Pipelight to use wine-staging

2015-05-10 13:46:32 +02:00

top-level

Merge branch 'master' into staging

2015-05-11 10:05:23 +02:00