]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
projects / thirdparty / cups.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3bd2e63 eee24e7)
Merge branch 'master' of https://github.com/apple/cups
authorMichael Sweet <michael.r.sweet@gmail.com>
Mon, 30 May 2016 23:11:42 +0000 (19:11 -0400)
committerMichael Sweet <michael.r.sweet@gmail.com>
Mon, 30 May 2016 23:11:42 +0000 (19:11 -0400)

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