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-16 22:49:55 +02:00
2016-05-21 13:52:28 +02:00
2016-04-26 13:38:03 +01:00
2016-04-14 01:32:52 +01:00
2016-08-24 13:19:38 +02:00
2016-08-21 20:17:14 +03:00
2016-08-11 23:07:09 +02:00
2016-01-25 17:35:21 +01:00
2016-08-23 04:53:27 +03:00
2016-05-04 10:11:04 +00:00
2016-08-02 21:21:02 +02:00
2016-04-13 15:21:11 +02:00
2016-03-05 18:55:26 +01:00