]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
projects / thirdparty / cups.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c82a625 b052dee)
Merge branch 'master' of https://github.com/apple/cups
authorMichael R Sweet <michaelrsweet@gmail.com>
Fri, 15 Apr 2016 11:15:56 +0000 (07:15 -0400)
committerMichael R Sweet <michaelrsweet@gmail.com>
Fri, 15 Apr 2016 11:15:56 +0000 (07:15 -0400)

Trivial merge
Mirror of https://github.com/OpenPrinting/cups.git