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-01 08:32:38 -04:00
2016-03-09 15:25:53 -03:00
2016-04-29 12:16:30 +02:00
2016-08-26 08:46:17 +02:00
2016-08-02 21:42:43 +03:00
2016-08-14 12:38:01 +02:00
2016-08-14 22:37:10 +03:00
2016-08-25 03:55:20 +02:00
2016-05-30 11:42:10 +02:00
2016-01-30 20:08:52 +01:00
2016-08-02 21:42:43 +03:00
2015-06-04 23:34:14 +03:00