William A. Kennington III 91e87c5f58 Merge branch 'master.upstream' into staging.upstream		2015-06-18 23:33:44 -07:00
..
altcoins	unbreak the nixpkgs monitor: url -> urls	2015-05-28 11:38:59 +03:00
audio	add myself as maintainer	2015-06-18 11:52:39 -07:00
backup/crashplan
display-managers	lightdm-gtk-greeter: 2.0.0 -> 2.0.1	2015-06-18 23:04:56 -07:00
editors	Separate nativeBuildInputs where maintainers |= nckx	2015-06-17 22:21:32 +02:00
gis	qgis: update to 2.8.2	2015-05-11 13:12:24 +02:00
graphics	darktable: update 1.6.6 -> 1.6.7	2015-06-18 14:13:27 +02:00
inferno
kde-apps-15.04	kdeApps_15_04.ktp-text-ui: add missing kdbusaddons dependency	2015-06-05 16:39:50 -05:00
misc	Merge branch 'master.upstream' into staging.upstream	2015-06-18 22:37:00 -07:00
networking	Merge branch 'master.upstream' into staging.upstream	2015-06-18 22:37:00 -07:00
office	add osmo, a handy personal organizer	2015-06-16 20:13:20 +02:00
science	nixpkgs: saw-tools 0.1-20150609	2015-06-18 11:37:51 -05:00
search
taxes	orig-gcc -> orig-cc	2015-03-04 22:15:46 +01:00
version-management	Merge branch 'master.upstream' into staging.upstream	2015-06-18 22:37:00 -07:00
video	Merge #8363: pure-darwin stdenv	2015-06-18 22:38:08 +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