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-08 18:29:40 +01:00
2016-08-25 03:14:40 +02:00
2016-08-23 03:26:54 +03:00
2016-04-07 11:57:12 -05:00
2016-08-02 21:17:44 +03:00
2015-11-19 14:51:14 +01:00
2016-07-10 10:26:14 +02:00
2016-08-02 21:42:43 +03:00
2016-06-26 05:58:35 +00:00
2016-07-19 15:55:22 +02:00
2016-06-20 13:55:52 +02:00
2016-06-20 13:55:52 +02:00
2016-08-12 09:46:53 +00:00
2016-04-22 00:57:43 +02:00
2015-10-05 13:44:16 +02:00
2016-01-17 22:44:48 -05:00
2016-08-17 22:43:06 +02:00
2016-08-02 21:42:43 +03:00
2016-08-02 21:42:43 +03:00
2016-08-02 21:42:43 +03:00
2015-11-28 14:24:21 +00:00
2014-11-11 14:36:34 +01:00
2015-08-05 10:29:47 +02:00