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
..
default.nix	Merge pull request #17979 from rardiol/springrts2	2016-08-26 12:04:50 +02:00
revert_58b423e.patch	springLobby: 0.247 -> 0.255	2016-08-24 22:20:32 -03:00
springlobby.nix	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00