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-10 22:29:58 -05:00
2016-08-02 21:17:44 +03:00
2016-08-27 23:54:54 +01:00
2016-06-03 17:17:08 +03:00
2016-07-04 12:02:37 +02:00
2016-08-11 23:07:09 +02:00
2016-08-02 21:42:43 +03:00
2016-08-27 23:54:54 +01:00
2016-08-27 23:54:54 +01:00
2016-08-27 23:54:54 +01:00
2016-08-07 20:46:37 +02:00
2016-06-10 09:27:04 +00:00
2016-08-23 02:56:12 +03:00
2016-08-20 00:05:35 +02:00
2016-08-11 16:29:04 -03:00
2016-07-21 00:56:43 +00:00
2016-08-07 20:46:37 +02:00
2016-08-27 23:54:54 +01:00
2016-08-02 21:17:44 +03:00
2016-08-23 09:30:49 +01:00
2016-08-27 23:54:54 +01:00
2016-08-24 20:18:46 +02:00