[asterisk-sounds-core/f13/master: 3/3] Merge branch 'master' into f13
Jeffrey C. Ollie
jcollie at fedoraproject.org
Tue Aug 3 19:06:34 UTC 2010
commit e9162bd5ade8d89e317d58390bf1e085327c68f5
Merge: 47fedeb 114dc38
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Tue Aug 3 14:06:10 2010 -0500
Merge branch 'master' into f13
.gitignore | 27 ++++++++++++++++++++++
asterisk-sounds-core.spec | 7 ++++-
sources | 54 ++++++++++++++++++++++----------------------
3 files changed, 59 insertions(+), 29 deletions(-)
---
diff --cc .gitignore
index 9e47901,014e529..b62c8bf
--- a/.gitignore
+++ b/.gitignore
@@@ -25,3 -25,30 +25,30 @@@ asterisk-core-sounds-fr-siren7-1.4.16.t
asterisk-core-sounds-fr-sln16-1.4.16.tar.gz
asterisk-core-sounds-fr-ulaw-1.4.16.tar.gz
asterisk-core-sounds-fr-wav-1.4.16.tar.gz
+ asterisk-core-sounds-en-alaw-1.4.19.tar.gz
+ asterisk-core-sounds-en-g722-1.4.19.tar.gz
+ asterisk-core-sounds-en-g729-1.4.19.tar.gz
+ asterisk-core-sounds-en-gsm-1.4.19.tar.gz
+ asterisk-core-sounds-en-siren14-1.4.19.tar.gz
+ asterisk-core-sounds-en-siren7-1.4.19.tar.gz
-asterisk-core-sounds-en-sln16-1.4.19.tar.gz
++asterisk-core-sounds-en-sln19-1.4.19.tar.gz
+ asterisk-core-sounds-en-ulaw-1.4.19.tar.gz
+ asterisk-core-sounds-en-wav-1.4.19.tar.gz
+ asterisk-core-sounds-es-alaw-1.4.19.tar.gz
+ asterisk-core-sounds-es-g722-1.4.19.tar.gz
+ asterisk-core-sounds-es-g729-1.4.19.tar.gz
+ asterisk-core-sounds-es-gsm-1.4.19.tar.gz
+ asterisk-core-sounds-es-siren14-1.4.19.tar.gz
+ asterisk-core-sounds-es-siren7-1.4.19.tar.gz
-asterisk-core-sounds-es-sln16-1.4.19.tar.gz
++asterisk-core-sounds-es-sln19-1.4.19.tar.gz
+ asterisk-core-sounds-es-ulaw-1.4.19.tar.gz
+ asterisk-core-sounds-es-wav-1.4.19.tar.gz
+ asterisk-core-sounds-fr-alaw-1.4.19.tar.gz
+ asterisk-core-sounds-fr-g722-1.4.19.tar.gz
+ asterisk-core-sounds-fr-g729-1.4.19.tar.gz
+ asterisk-core-sounds-fr-gsm-1.4.19.tar.gz
+ asterisk-core-sounds-fr-siren14-1.4.19.tar.gz
+ asterisk-core-sounds-fr-siren7-1.4.19.tar.gz
-asterisk-core-sounds-fr-sln16-1.4.19.tar.gz
++asterisk-core-sounds-fr-sln19-1.4.19.tar.gz
+ asterisk-core-sounds-fr-ulaw-1.4.19.tar.gz
+ asterisk-core-sounds-fr-wav-1.4.19.tar.gz
More information about the scm-commits
mailing list