Shea Levy c514ee974a Merge remote-tracking branch 'upstream/master' into x-updates ... mountall conflict was trivial Conflicts: pkgs/os-specific/linux/mountall/default.nix		2012-07-14 14:24:27 -04:00
..
cacert	cacert: Update to 20120628	2012-07-05 17:31:23 -04:00
gsettings-desktop-schemas	Move gsettings-desktop-schemas to data/misc	2012-03-08 22:45:58 +00:00
hicolor-icon-theme
iana-etc
miscfiles
mobile-broadband-provider-info	Add mobile-broadband-provider-info	2012-01-05 23:25:28 +00:00
poppler-data	Let poppler use ${POPPLER_DATADIR}	2011-09-19 08:35:30 +00:00
shared-desktop-ontologies	SDO: add meta.homepage	2012-01-14 18:04:34 +00:00
shared-mime-info	shared-mime-info-1.0	2012-03-31 21:29:12 +00:00
themes	Get Theme-GNU directly from spock while kernel.org is down	2011-09-28 22:34:46 +00:00
xkeyboard-config	* xkeyboard-config updated to 2.5.1.	2012-05-15 21:30:03 +00:00