Eelco Dolstra 10cb4a8cf2 Merge remote-tracking branch 'origin/master' into multiple-outputs ... Conflicts: pkgs/development/libraries/gtk+/2.x.nix pkgs/development/libraries/libsamplerate/default.nix pkgs/development/libraries/libsndfile/default.nix pkgs/misc/cups/default.nix pkgs/top-level/all-packages.nix		2013-08-21 17:05:30 +02:00
..
drivers	Package Samsung unified printer driver. i686 only but apparently can be improved to support x86_64. Based on patch by James Cook <james.cook[NOSPAM]@utoronto.ca>	2012-12-05 05:43:19 +02:00
default.nix	Merge remote-tracking branch 'origin/master' into multiple-outputs	2013-08-21 17:05:30 +02:00
pdf-filter.nix	Revert "Remove cups-pdf-filter"	2012-10-08 14:43:47 -04:00