William A. Kennington III 4f22eadf2c Merge branch 'master.upstream' into staging.upstream		2015-08-19 20:52:17 -07:00
..
drivers	canon-cups-ufr2: init at 2.90	2015-08-20 01:22:10 +02:00
default.nix	cups: remove xdg_utils dependency	2015-08-16 20:23:01 +02:00
filters.nix	cups-filters: update, including security fixes	2015-07-21 20:57:49 +02:00