Eelco Dolstra d5758c99a3 Merge remote-tracking branch 'origin/master' into x-updates ... Conflicts: pkgs/misc/maven/maven-1.0.nix pkgs/os-specific/linux/xf86-input-wacom/default.nix		2012-09-26 14:51:51 -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	Add some packages to the channel	2012-08-17 09:53:55 -04:00
iana-etc	* Updated the IANA /etc info.	2009-05-28 12:42:41 +00:00
miscfiles	Adding bsdgames and miscfiles (this later, for 'words')	2009-10-26 23:03:36 +00:00
mobile-broadband-provider-info	mobile-broadband-provider-info: Update to 20120614	2012-07-31 15:16:11 +02:00
poppler-data	Let poppler use ${POPPLER_DATADIR}	2011-09-19 08:35:30 +00:00
shared-desktop-ontologies	SDO-0.10.0	2012-08-26 22:23:17 +04: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
tzdata	Add tzdata	2012-09-18 14:00:18 -04:00
xkeyboard-config	* xkeyboard-config updated to 2.5.1.	2012-05-15 21:30:03 +00:00