Vladimír Čunát b770365574 ReRevert Merge x-updates into master ... This reverts commit ec3965d8d0. Conflicts (taken x-updates): pkgs/development/libraries/libgcrypt/default.nix pkgs/development/libraries/libgpg-error/default.nix pkgs/development/libraries/poppler/default.nix		2013-05-29 23:25:02 +02:00
..
cacert	cacert: Update to 20121229	2013-05-15 13:15:53 +02:00
freepats	Fix maintainers attribute	2013-05-21 09:20:00 +02:00
hicolor-icon-theme
iana-etc
miscfiles
mobile-broadband-provider-info
poppler-data	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
shared-desktop-ontologies
shared-mime-info	shared-mime-info: update to 1.1	2013-05-25 12:01:26 +03:00
tzdata
xkeyboard-config	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00