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
..
2015-10-17 20:48:21 -04:00
2016-08-02 21:42:43 +03:00
2016-08-23 04:52:13 +03:00
2016-08-27 23:54:54 +01:00
2016-08-27 23:54:54 +01:00
2014-12-26 11:06:21 -06:00
2015-08-26 16:50:55 +02:00
2016-08-14 12:38:01 +02:00
2016-05-19 10:04:38 +02:00
2016-08-02 21:42:43 +03:00
2016-08-16 22:52:37 +02:00
2016-03-28 01:00:27 +02:00
2016-08-14 12:33:50 -04:00
2016-05-19 16:19:18 -04:00
2016-03-05 18:55:26 +01:00
2016-03-09 12:44:29 +01:00
2016-08-02 21:17:44 +03:00
2016-08-16 19:25:45 +00:00
2016-08-25 23:30:34 +02:00
2016-08-21 20:15:14 +03:00
2016-01-26 01:35:55 +01:00
2016-08-03 20:28:05 +00:00
2016-08-18 11:23:05 -03:00
2016-07-04 01:52:58 +03:00
2016-08-02 21:42:43 +03:00
2016-08-26 14:48:35 +02:00
2015-02-06 15:31:32 +01:00