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-06-22 17:15:15 +02:00
2016-06-23 12:09:03 +02:00
2016-08-02 20:58:35 -04:00
2016-03-09 23:43:20 +11:00
2016-08-06 17:06:45 +03:00
2016-08-17 13:40:05 +02:00
2016-07-15 14:41:01 +00:00
2016-08-23 01:18:10 +03:00
2016-08-25 01:56:36 +02:00
2016-06-12 11:14:13 +02:00
2016-07-15 14:41:01 +00:00