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
..
apps	treewide: Make explicit that 'dev' output of nspr (and glib) is used	2016-08-23 03:52:07 +03:00
core	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
desktop/rarian	gnome3_20: Add GNOME 3.20 package set	2016-06-06 20:33:58 +02:00
devtools	nemiver: init at 0.9.6	2016-08-05 22:03:58 +02:00
games	five-or-more: 3.20.0 -> 3.20.1	2016-08-12 12:15:35 +02:00
misc	Merge branch 'master' into staging	2016-08-23 18:50:06 +01:00
default.nix	nemiver: init at 0.9.6	2016-08-05 22:03:58 +02:00
installer.nix	gnome3_20: Add GNOME 3.20 package set	2016-06-06 20:33:58 +02:00