]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
projects / thirdparty / cups.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a7059a a395099)
Merge branch 'master' of https://github.com/apple/cups
authorMichael R Sweet <michaelrsweet@gmail.com>
Mon, 11 Apr 2016 21:16:32 +0000 (17:16 -0400)
committerMichael R Sweet <michaelrsweet@gmail.com>
Mon, 11 Apr 2016 21:16:32 +0000 (17:16 -0400)

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