Eelco Dolstra 4970574409 Merge remote-tracking branch 'origin/gcc-4.9' into staging ... Conflicts: pkgs/development/libraries/wayland/default.nix		2015-06-11 00:23:03 +02:00
..
altcoins	unbreak the nixpkgs monitor: url -> urls	2015-05-28 11:38:59 +03:00
audio	Merge pull request #8275 from k0ral/mpc	2015-06-10 22:37:48 +02:00
backup/crashplan	crashplan: install desktop file	2014-12-19 23:26:35 +01:00
display-managers	lightdm: Update to stable 1.14.2	2015-05-28 16:23:46 -07:00
editors	neovim -> 2015-06-09	2015-06-10 00:50:35 +02:00
gis	qgis: update to 2.8.2	2015-05-11 13:12:24 +02:00
graphics	Merge pull request #8094 from rzetterberg/antimony	2015-06-08 15:04:01 +02:00
inferno	rename <gcc-frontend>.gcc to <gcc-frontend>.cc	2015-01-14 20:59:10 -08:00
kde-apps-15.04	kdeApps_15_04.ktp-text-ui: add missing kdbusaddons dependency	2015-06-05 16:39:50 -05:00
misc	Merge remote-tracking branch 'origin/master' into staging	2015-06-11 00:18:24 +02:00
networking	Merge remote-tracking branch 'origin/gcc-4.9' into staging	2015-06-11 00:23:03 +02:00
office	Revert "heimdal: Remove more references"	2015-06-06 12:01:42 -07:00
science	Update HOL Light to svn r232 (2015-05-31)	2015-06-03 11:17:39 +02:00
search	kill libiconvOr*	2015-02-07 20:29:28 -08:00
taxes	orig-gcc -> orig-cc	2015-03-04 22:15:46 +01:00
version-management	Merge remote-tracking branch 'origin/master' into staging	2015-06-11 00:18:24 +02:00
video	Merge remote-tracking branch 'origin/master' into staging	2015-06-11 00:18:24 +02:00
virtualization	Revert "qemu: 2.2.2 -> 2.3.0"	2015-06-04 14:54:48 +02:00
window-managers	Merge branch 'master.upstream' into staging.upstream	2015-06-06 12:04:42 -07:00