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
..
enlightenment	efl: remove elementary, evas and emotion, as they are integrated into efl-0.18.0	2016-08-23 11:50:45 -03:00
gnome-2	Merge branch 'hardened-stdenv' into staging	2016-08-22 01:19:35 +01:00
gnome-3	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
gnustep	gnustep: attempt to fix osx building	2016-08-16 21:53:45 +00:00
kde-4.14	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-08-16 07:54:01 +00:00
kde-5	kde5.startkde: initialize session variables before loading user env	2016-08-26 08:42:28 -05:00
lxde/core	lxmenu-data: switch sf downloads to mirror://	2016-08-20 19:14:29 +05:30
mate	mate-themes: 3.20.8 -> 3.20.10	2016-08-04 08:05:50 -03:00
pantheon/apps/pantheon-terminal	pantheon-terminal: vala -> vala_0_23	2016-08-21 20:04:55 +03:00
xfce	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-08-03 13:34:44 +00:00