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