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
..
2016-05-18 17:10:02 +02:00
2016-08-02 21:42:43 +03:00
2016-08-02 21:42:43 +03:00
2016-04-14 02:37:53 +02:00
2016-06-03 17:17:08 +03:00
2016-08-02 21:42:43 +03:00
2015-04-28 10:55:20 +02:00
2016-04-29 21:42:35 +02:00
2016-06-23 00:55:54 +02:00
2016-08-25 16:07:40 +00:00