obadz 3de6e5be50 Merge branch 'master' into staging ... Conflicts: pkgs/applications/misc/navit/default.nix pkgs/applications/networking/mailreaders/alpine/default.nix pkgs/applications/networking/mailreaders/realpine/default.nix pkgs/development/compilers/ghc/head.nix pkgs/development/libraries/openssl/default.nix pkgs/games/liquidwar/default.nix pkgs/games/spring/springlobby.nix pkgs/os-specific/linux/kernel/perf.nix pkgs/servers/sip/freeswitch/default.nix pkgs/tools/archivers/cromfs/default.nix pkgs/tools/graphics/plotutils/default.nix		2016-08-27 23:54:54 +01:00
..
applications	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
build-support	Merge remote-tracking branch 'origin/master' into hardened-stdenv	2016-08-24 11:01:53 +02:00
data	source-code-pro: 2.010 -> 2.030	2016-08-27 10:41:36 +02:00
desktops	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
development	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
games	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
misc	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
os-specific	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
servers	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
shells	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
stdenv	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
test
tools	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
top-level	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00