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
gsettings-desktop-schemas
hicolor-icon-theme	Add some packages to the channel	2012-08-17 09:53:55 -04:00
iana-etc
miscfiles
mobile-broadband-provider-info	mobile-broadband-provider-info: Update to 20120614	2012-07-31 15:16:11 +02:00
poppler-data
shared-desktop-ontologies	SDO-0.10.0	2012-08-26 22:23:17 +04:00
shared-mime-info
themes
tzdata	Add tzdata	2012-09-18 14:00:18 -04:00
xkeyboard-config