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-23 00:04:39 +03:00
2016-04-18 13:49:22 +00:00
2016-05-16 22:49:55 +02:00
2016-08-23 00:04:39 +03:00
2016-08-26 14:57:46 +00:00
2016-08-26 14:57:46 +00:00
2016-08-23 00:04:39 +03:00
2016-08-26 14:57:46 +00:00
2016-08-26 14:57:46 +00:00
2016-08-26 14:57:46 +00:00
2016-08-26 14:57:46 +00:00
2016-08-26 14:57:46 +00:00
2016-08-26 14:57:46 +00:00
2016-08-26 14:57:46 +00:00
2015-02-14 19:41:49 +01:00
2015-02-10 22:08:01 +01:00
2015-02-10 22:08:01 +01:00
2015-02-10 22:08:01 +01:00
2015-06-12 10:54:02 +02:00
2016-04-14 09:17:55 +02:00
2016-04-14 09:17:55 +02:00
2016-08-27 23:54:54 +01:00
2015-05-17 14:31:24 -07:00
2016-08-26 14:57:46 +00:00
2016-08-26 15:19:37 +00:00