Mark Michelson 7eb4b5bf5b Merged revisions 134050 via svnmerge from ...

https://origsvn.digium.com/svn/asterisk/trunk

........
r134050 | mmichelson | 2008-07-28 11:00:19 -0500 (Mon, 28 Jul 2008) | 3 lines

merging the zap_and_dahdi_trunk branch up to trunk


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134052 65c4cc65-6c06-0410-ace0-fbb531ad65f3

2008-07-28 16:13:34 +00:00

..

asterisk

Merged revisions 134050 via svnmerge from

2008-07-28 16:13:34 +00:00

solaris-compat

fix the provided unsetenv for solaris to return an int like it's supposed to

2006-03-29 04:14:12 +00:00

asterisk.h

These prototypes are not supposed to be in asterisk.h. They are already in

2008-01-10 00:54:01 +00:00

jitterbuf.h

Merged revisions 109447 via svnmerge from

2008-03-18 15:58:50 +00:00