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
..
altcoins	Merge pull request #7602 from sfultong/bitcoin10.1	2015-05-08 13:41:52 +03:00
audio	fix evals /cc @ttuegel	2015-05-10 13:46:32 +02:00
backup/crashplan	crashplan: install desktop file	2014-12-19 23:26:35 +01:00
display-managers	fix evals /cc @ttuegel	2015-05-10 13:46:32 +02:00
editors	Merge branch 'master' into staging	2015-05-08 05:59:50 -07:00
gis	qgis: update from 2.6.1 to 2.8.1	2015-04-24 11:12:31 +02:00
graphics	Merge remote-tracking branch 'upstream/master' into staging	2015-05-07 01:44:49 -07:00
inferno	rename <gcc-frontend>.gcc to <gcc-frontend>.cc	2015-01-14 20:59:10 -08:00
kde-apps-15.04	kdeApps_15_04.signon-kwallet-extension: fix build	2015-05-07 21:49:53 -05:00
misc	Merge branch 'master' into staging	2015-05-11 10:05:23 +02:00
networking	Merge branch 'master' into staging	2015-05-11 10:05:23 +02:00
office	Update LibreOffice to 4.4.3.2	2015-05-08 14:47:44 +03:00
science	z3 opt	2015-05-10 13:46:00 +02:00
search	kill libiconvOr*	2015-02-07 20:29:28 -08:00
taxes	orig-gcc -> orig-cc	2015-03-04 22:15:46 +01:00
version-management	git: 2.3.6 -> 2.4.0	2015-05-10 13:46:01 +02:00
video	Merge branch 'master' into staging	2015-05-11 10:05:23 +02:00
virtualization	docker: fix build	2015-05-10 13:46:32 +02:00
window-managers	Drop obsolete pre-NG Haskell builds.	2015-05-05 21:44:47 +02:00