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-06 17:21:12 +02:00
2016-08-24 21:31:02 +02:00
2016-07-21 14:41:44 +02:00
2016-07-21 14:41:44 +02:00
2016-07-21 14:41:44 +02:00
2016-07-14 22:13:48 +02:00
2016-07-21 17:57:28 +02:00
2016-07-21 16:40:02 +02:00
2016-08-21 11:11:17 +02:00
2016-08-04 17:40:17 +01:00
2016-01-27 00:33:26 +01:00
2015-11-29 15:30:31 +01:00
2016-07-27 14:28:31 -04:00
2016-08-24 15:46:39 +02:00
2016-08-24 15:57:57 +02:00
2016-07-16 13:34:06 +02:00
2016-06-13 09:51:35 +02:00
2016-06-15 17:08:41 +02:00
2016-08-24 16:01:06 +02:00
2015-08-18 19:56:17 +00:00
2016-06-20 22:52:20 +03:00
2016-06-13 23:09:56 +02:00
2016-04-13 22:09:41 +03:00