]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
projects / thirdparty / cups.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a75c0e5 02c88e6)
Merge branch 'master' of https://github.com/apple/cups
authorPascal Ernster <git@hardfalcon.net>
Sun, 22 Oct 2017 20:13:10 +0000 (22:13 +0200)
committerPascal Ernster <git@hardfalcon.net>
Sun, 22 Oct 2017 20:13:10 +0000 (22:13 +0200)

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