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
..
default.nix	Merge branch 'master' into staging	2016-08-23 18:50:06 +01:00
pfixtools.nix
pflogsumm.nix	pflogsumm: init at 1.1.3	2016-08-21 21:18:28 +02:00
post-install-script.patch
postfix-3.0-no-warnings.patch
postfix-script-shell.patch
relative-symlinks.patch