]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
projects / thirdparty / cups.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 82341b0 4a9942a)
Merge pull request #5213 from albert-astals-cid-kdab/ppdInstallableConflict
authorMichael R Sweet <michaelrsweet@gmail.com>
Wed, 10 Jan 2018 02:06:51 +0000 (21:06 -0500)
committerGitHub <noreply@github.com>
Wed, 10 Jan 2018 02:06:51 +0000 (21:06 -0500)
Fix ppdInstallableConflict conflict reporting


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.