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-04-24 22:38:47 +03:00
2016-08-27 23:54:54 +01:00
2016-05-19 10:00:26 +02:00
2016-01-10 12:16:43 -05:00
2016-04-15 18:21:33 -04:00
2015-05-18 15:10:33 -04:00
2016-05-04 10:11:04 +00:00
2014-03-12 10:00:45 +01:00
2016-04-02 16:26:32 +02:00
2016-07-23 00:54:25 +02:00
2016-05-04 10:11:04 +00:00
2016-06-01 01:40:50 +02:00
2016-08-20 13:43:58 +02:00
2015-10-28 17:36:20 -07:00
2016-08-24 07:35:30 -04:00
2014-06-30 14:56:10 +02:00