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-26 17:08:58 +02:00
2016-05-16 22:49:55 +02:00
2016-08-03 13:34:44 +00:00
2016-08-11 23:07:09 +02:00
2016-06-12 18:57:29 +01:00
2016-07-11 05:43:47 +01:00
2016-08-02 21:42:43 +03:00
2015-12-17 16:29:00 +01:00
2016-07-15 14:41:01 +00:00
2015-11-24 18:50:02 -05:00
2016-08-11 23:07:09 +02:00
2016-08-05 09:53:48 -04:00
2016-07-28 17:16:37 -07:00
2016-08-26 16:24:43 +03:00
2016-05-16 12:02:14 +10:00
2016-06-12 18:57:30 +01:00
2016-08-26 14:59:39 +02:00
2016-07-21 01:01:57 +02:00
2016-06-12 18:57:31 +01:00
2016-06-27 00:39:18 +02:00
2016-08-02 21:42:43 +03:00