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-07-08 14:54:44 +02:00
2016-08-26 16:59:27 +02:00
2016-08-03 09:20:37 +02:00
2016-08-24 07:35:30 -04:00
2016-07-19 14:12:13 +02:00
2016-08-23 00:04:39 +03:00
2016-08-02 21:42:43 +03:00
2016-06-24 20:41:40 +02:00
2016-08-02 21:42:43 +03:00
2016-08-23 04:32:21 +03:00
2016-08-02 21:17:44 +03:00
2016-08-02 21:42:43 +03:00
2016-08-02 21:17:44 +03:00
2016-08-17 20:20:35 +03:00
2016-08-02 12:23:15 +02:00
2016-08-17 20:30:51 +03:00
2016-08-02 21:42:43 +03:00
2016-06-20 01:06:07 +02:00
2016-08-02 17:54:42 +02:00
2016-07-29 17:22:20 +02:00