Log In
rpms
/
socat
Clone
Source Code
GIT
Source
Pull Requests
0
Stats
Overview
Files
Commits
Branches
Forks
Releases
1262c3
Merge branch 'master' into f20
Merged and Committed by Paul Wouters
10 years ago
raw
patch
tree
parents
56a089457fbc5ab763f6bfb2e441d1d7d0cf3212
4f38a7bb351755cd8614f463c4e68049ae3b83f6
3 files changed.
16 lines added
.
18 lines removed
.
.gitignore
file modified
+1
-0
socat.spec
file modified
+14
-17
sources
file modified
+1
-1
Merge branch 'master' into f20 Conflicts: .gitignore socat.spec sources
.gitignore
file modified
+1
-0
socat.spec
file modified
+14
-17
sources
file modified
+1
-1