nixpkgs/pkgs/data/misc
Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
..
cacert cacert: Update to 20140704 2014-07-30 10:14:40 +02:00
freepats Whitespace fixes in package expressions I maintain 2014-01-02 17:58:08 +01:00
iana-etc * Updated the IANA /etc info. 2009-05-28 12:42:41 +00:00
miscfiles Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
mobile-broadband-provider-info mobile-broadband-provider-info: Update to 20120614 2012-07-31 15:16:11 +02:00
poppler-data ReRevert Merge x-updates into master 2013-05-29 23:25:02 +02:00
shared-desktop-ontologies shared-desktop-ontologies: version bump to 0.11.0 2013-07-12 16:36:12 +03:00
shared-mime-info shared_mime_info: update from 1.1 to 1.2 2013-12-04 06:53:44 +02:00
tzdata Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00