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
..
debian-patches.nix	2.6-2 moved to 2.6-3, so patches were not found	2012-10-25 06:07:39 +02:00
debian-patches.txt	plotutils: fix compilation with libpng15 (debian)	2012-01-25 18:06:30 +00:00
default.nix	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00