Log In
rpms
/
cups
Clone
Source Code
GIT
Source
Pull Requests
0
Stats
Overview
Files
Commits
Branches
Forks
Releases
72a35e
Merge branch 'f21'
Merged and Committed by Tim Waugh
9 years ago
raw
patch
tree
parents
f64b8b6106fdbcc82ce80623d7971d8fc052034c
a52574af07ff039fa4d3336c6042325e00a19975
2 files changed.
19 lines added
.
14 lines removed
.
cups-systemd-socket.patch
file modified
+15
-13
cups.spec
file modified
+4
-1
Merge branch 'f21' Conflicts: cups-systemd-socket.patch cups.spec
cups-systemd-socket.patch
file modified
+15
-13
cups.spec
file modified
+4
-1