Eelco Dolstra bc1773fe16 Merge remote-tracking branch 'origin/staging' into systemd-219 ... Conflicts: pkgs/os-specific/linux/kernel/linux-3.4.nix pkgs/os-specific/linux/systemd/default.nix		2015-07-20 22:57:23 +02:00
..
altcoins	bitcoin: 0.10.2 -> 0.11.0	2015-07-13 23:49:52 -04:00
audio	keyfinder-cli: use old libkeyfinder 0.11 "for now"	2015-07-15 03:31:55 +02:00
backup/crashplan
display-managers	lightdm-gtk-greeter: 2.0.0 -> 2.0.1	2015-06-18 23:04:56 -07:00
editors	Merge branch 'master.upstream' into staging.upstream	2015-07-19 15:20:04 -07:00
gis	saga: update from 2.1.4 to 2.2.0	2015-07-06 07:59:04 +02:00
graphics	Merge branch 'master.upstream' into staging.upstream	2015-07-05 13:06:02 -07:00
inferno
kde-apps-15.04	update to kde-applications-15.04.3	2015-07-18 18:48:28 -05:00
misc	Merge pull request #8886 from matthiasbeyer/update-mdp	2015-07-20 00:31:36 +03:00
networking	Merge remote-tracking branch 'origin/staging' into systemd-219	2015-07-20 22:57:23 +02:00
office	libreoffice: work around a build problem	2015-07-19 11:21:25 +02:00
science	Updating gtkwave 3.3.64 to 3.3.66	2015-07-17 18:24:35 +02:00
search	recoll: 1.18.1 -> 1.20.6	2015-06-30 23:19:47 +02:00
taxes
version-management	Merge master into staging	2015-07-17 06:38:04 +02:00
video	Merge pull request #8866 from spencerjanssen/obs-version-bump	2015-07-19 16:56:55 -05:00
virtualization	Merge pull request #8723 from ts468/upstream.cbfstool	2015-07-15 10:57:50 +02:00
window-managers	Merge branch 'master.upstream' into staging.upstream	2015-07-15 02:02:46 -07:00