[asterisk: 2/4] Merge branch 'master' into 1.8.3-dev

Jeffrey C. Ollie jcollie at fedoraproject.org
Wed Jan 26 21:40:30 UTC 2011


commit eef8439dc62aa3f10d7d813ab17ee920ae686d39
Merge: 29eb470 2e519cf
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Wed Jan 26 15:16:57 2011 -0600

    Merge branch 'master' into 1.8.3-dev
    
    Conflicts:
    	.gitignore
    	asterisk.spec
    	sources

 .gitignore    |    2 ++
 asterisk.spec |   17 +++++++++++++++++
 2 files changed, 19 insertions(+), 0 deletions(-)
---
diff --cc .gitignore
index 20f75e1,22d14d2..dda02d2
--- a/.gitignore
+++ b/.gitignore
@@@ -22,5 -22,5 +22,7 @@@ asterisk-1.8.0-beta3.tar.gz.as
  /asterisk-1.8.1.tar.gz.asc
  /asterisk-1.8.2.2.tar.gz
  /asterisk-1.8.2.2.tar.gz.asc
+ /asterisk-1.8.2.3.tar.gz
+ /asterisk-1.8.2.3.tar.gz.asc
 +/asterisk-1.8.3-rc1.tar.gz
 +/asterisk-1.8.3-rc1.tar.gz.asc


More information about the scm-commits mailing list