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-22 01:19:35 +01:00
2016-07-10 18:07:37 +10:00
2016-02-03 16:35:21 +03:00
2016-08-23 16:20:26 +03:00
2016-08-19 17:56:54 +03:00
2016-08-04 23:12:39 +03:00
2016-08-19 17:56:54 +03:00
2015-12-23 06:04:39 +01:00
2016-07-18 13:45:37 +03:00
2016-06-26 22:58:04 +02:00
2016-08-22 01:15:13 +01:00
2016-08-23 18:14:06 +00:00
2016-08-19 17:56:54 +03:00
2016-02-23 11:56:09 +01:00
2016-07-19 09:42:53 +02:00
2016-04-25 13:24:39 +03:00
2016-07-19 09:42:53 +02:00
2015-04-19 22:06:45 +02:00