Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size ... Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.		2016-04-01 10:06:01 +02:00
..
cacert	Fix random ugliness	2015-07-31 01:36:41 +02:00
ddccontrol-db
freepats
geolite-legacy	geolite-legacy 2016-02-25 -> 2016-02-29	2016-02-29 21:15:25 +01:00
iana-etc
media-player-info	Merge branch 'master' into closure-size	2016-02-14 08:33:51 +01:00
miscfiles
mobile-broadband-provider-info
nixos-artwork	nixos-artwork: only download the necessary artwork	2015-06-12 11:45:58 +02:00
poppler-data
shared-desktop-ontologies
shared-mime-info	shared-mime-info: 1.3 -> 1.5	2015-10-02 05:31:41 +02:00
sound-theme-freedesktop	Add version attribute where maintainers |= nckx	2016-01-25 17:35:21 +01:00
tzdata	Merge branch 'master' into closure-size	2016-04-01 10:06:01 +02:00
wireless-regdb	wireless-regdb: 2015-12-14 -> 2016-02-08	2016-02-12 00:14:01 +01:00