Log In
mspacek
/
rpms
/
asterisk
Forked from
rpms/asterisk
2 years ago
Clone
Source Code
GIT
Source
Issues
Stats
Overview
Files
Commits
Branches
Forks
Releases
52e1219
Merge branch 'master' into f18
Merged and Committed by
jcollie
11 years ago
raw
patch
tree
parents
7ca9f3f18790a6f49a11ed0d4c32093238a5cb7b
90518d2bac2dabbbc16bc3a68c26aa9217b2f2e7
4 files changed.
317 lines added
.
17 lines removed
.
.gitignore
file modified
+6
-0
asterisk.spec
file modified
+307
-13
menuselect.makeopts
file modified
+2
-2
sources
file modified
+2
-2
Merge branch 'master' into f18 Conflicts: .gitignore asterisk.spec sources
.gitignore
file modified
+6
-0
asterisk.spec
file modified
+307
-13
menuselect.makeopts
file modified
+2
-2
sources
file modified
+2
-2