Vladimír Čunát 09af15654f Merge master into closure-size ... The kde-5 stuff still didn't merge well. I hand-fixed what I saw, but there may be more problems.		2016-03-08 09:58:19 +01:00
..
drivers	splix: revert "2.0.0 -> svn-r315" version update	2016-03-07 13:37:54 +01:00
cups-pk-helper.nix	cups-pk-helper: init at 0.2.5	2016-01-01 23:33:11 +01:00
default.nix	Merge master into closure-size	2016-03-08 09:58:19 +01:00
filters.nix	cups_filters: 1.0.71 -> 1.5.0	2016-01-17 15:50:40 +03:00