kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-07 18:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
f30f9040990468d16352961100dba34a65f8f69a
asterisk/main
History
Mark Michelson d3b10cb2a5 Merged revisions 186833 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r186833 | mmichelson | 2009-04-07 18:50:56 -0500 (Tue, 07 Apr 2009) | 15 lines
  
  Merged revisions 186832 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r186832 | mmichelson | 2009-04-07 18:49:49 -0500 (Tue, 07 Apr 2009) | 8 lines
    
    Set the AST_FEATURE_WARNING_ACTIVE flag when a p2p bridge returns AST_BRIDGE_RETRY.
    
    Without this flag set, warning sounds will not be properly played to either party
    of the bridge.
    
    (closes issue #14845)
    Reported by: adomjan
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@186834 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-07 23:51:25 +00:00
..
db1-ast
Merged revisions 157974 via svnmerge from
2008-11-20 00:12:32 +00:00
editline
Merged revisions 179396 via svnmerge from
2009-03-02 20:17:55 +00:00
stdtime
Merged revisions 157974 via svnmerge from
2008-11-20 00:12:32 +00:00
abstract_jb.c
Merged revisions 135851 via svnmerge from
2008-08-06 00:31:28 +00:00
acl.c
Merged revisions 129045 via svnmerge from
2008-07-08 16:41:31 +00:00
adsistub.c
remove a bunch of useless #include "options.h"
2007-11-21 23:09:02 +00:00
aescrypt.c
use the OpenSSL AES implementation if it's available (unless configured not to)
2007-05-24 22:07:50 +00:00
aeskey.c
use the OpenSSL AES implementation if it's available (unless configured not to)
2007-05-24 22:07:50 +00:00
aesopt.h
…
aestab.c
use the OpenSSL AES implementation if it's available (unless configured not to)
2007-05-24 22:07:50 +00:00
alaw.c
Merged revisions 105840 via svnmerge from
2008-03-06 00:14:32 +00:00
app.c
Merged revisions 180032 via svnmerge from
2009-03-03 23:35:18 +00:00
ast_expr2.c
Merged revisions 179973 via svnmerge from
2009-03-03 23:26:54 +00:00
ast_expr2.fl
Merged revisions 179973 via svnmerge from
2009-03-03 23:26:54 +00:00
ast_expr2.h
Merged revisions 179973 via svnmerge from
2009-03-03 23:26:54 +00:00
ast_expr2.y
Merged revisions 179973 via svnmerge from
2009-03-03 23:26:54 +00:00
ast_expr2f.c
Merged revisions 179973 via svnmerge from
2009-03-03 23:26:54 +00:00
asterisk.c
Merged revisions 184220 via svnmerge from
2009-03-25 14:52:21 +00:00
astmm.c
Merged revisions 144949-144951 via svnmerge from
2008-09-27 16:36:39 +00:00
astobj2.c
Merged revisions 175121 via svnmerge from
2009-02-12 16:33:24 +00:00
audiohook.c
Merged revisions 186379 via svnmerge from
2009-04-03 16:36:44 +00:00
autoservice.c
Merged revisions 163449 via svnmerge from
2008-12-12 14:05:01 +00:00
buildinfo.c
…
callerid.c
Merged revisions 180195 via svnmerge from
2009-03-04 19:25:59 +00:00
cdr.c
Merged revisions 159360 via svnmerge from
2008-11-25 23:09:11 +00:00
channel.c
Merged revisions 186833 via svnmerge from
2009-04-07 23:51:25 +00:00
chanvars.c
another bunch of include removals (errno.h and asterisk/logger.h)
2007-11-19 19:09:03 +00:00
cli.c
Merged revisions 160208 via svnmerge from
2008-12-02 00:57:31 +00:00
config.c
Merged revisions 161181 via svnmerge from
2008-12-05 05:43:36 +00:00
cryptostub.c
Merged revisions 148200 via svnmerge from
2008-10-10 01:25:31 +00:00
cygload.c
Doxygen updates, formatting.
2007-12-11 22:20:22 +00:00
db.c
Merged revisions 182450 via svnmerge from
2009-03-17 05:53:17 +00:00
devicestate.c
Merged revisions 133945-133946 via svnmerge from
2008-07-26 15:17:46 +00:00
dial.c
Merged revisions 122557 via svnmerge from
2008-06-13 14:15:56 +00:00
dns.c
Merged revisions 159818 via svnmerge from
2008-11-29 18:37:55 +00:00
dnsmgr.c
Merged revisions 130744 via svnmerge from
2008-07-14 17:22:54 +00:00
dsp.c
Merged revisions 130129 via svnmerge from
2008-07-11 18:14:27 +00:00
ecdisa.h
…
enum.c
Merged revisions 180534 via svnmerge from
2009-03-06 17:28:52 +00:00
event.c
Merged revisions 159818 via svnmerge from
2008-11-29 18:37:55 +00:00
features.c
Merged revisions 183436 via svnmerge from
2009-03-19 20:32:20 +00:00
file.c
Merged revisions 184515 via svnmerge from
2009-03-27 01:43:13 +00:00
fixedjitterbuf.c
Start untangling header inclusion in a way that does not affect
2007-11-16 20:04:58 +00:00
fixedjitterbuf.h
Merged revisions 135851 via svnmerge from
2008-08-06 00:31:28 +00:00
frame.c
Merged revisions 180373 via svnmerge from
2009-03-05 18:36:31 +00:00
fskmodem_float.c
Merged revisions 132510 via svnmerge from
2008-07-21 21:02:25 +00:00
fskmodem_int.c
Merged revisions 132510 via svnmerge from
2008-07-21 21:02:25 +00:00
fskmodem.c
Merged revisions 132511 via svnmerge from
2008-07-21 21:02:55 +00:00
global_datastores.c
Merged revisions 172580 via svnmerge from
2009-01-30 23:58:31 +00:00
hashtab.c
Merged revisions 132050 via svnmerge from
2008-07-18 17:56:14 +00:00
http.c
Merged revisions 183865 via svnmerge from
2009-03-23 23:29:51 +00:00
image.c
Merged revisions 105840 via svnmerge from
2008-03-06 00:14:32 +00:00
indications.c
Merged revisions 168562 via svnmerge from
2009-01-13 19:27:54 +00:00
io.c
Merged revisions 182847 via svnmerge from
2009-03-18 14:24:27 +00:00
jitterbuf.c
Merged revisions 174584 via svnmerge from
2009-02-10 18:19:45 +00:00
loader.c
Merged revisions 183242 via svnmerge from
2009-03-19 18:08:02 +00:00
logger.c
Merged revisions 176174 via svnmerge from
2009-02-16 18:33:05 +00:00
Makefile
Merged revisions 182847 via svnmerge from
2009-03-18 14:24:27 +00:00
manager.c
Merged revisions 186720 via svnmerge from
2009-04-07 20:49:54 +00:00
md5.c
Start untangling header inclusion in a way that does not affect
2007-11-16 20:04:58 +00:00
netsock.c
Merged revisions 105840 via svnmerge from
2008-03-06 00:14:32 +00:00
pbx.c
Merged revisions 177787 via svnmerge from
2009-02-20 23:04:33 +00:00
plc.c
Start untangling header inclusion in a way that does not affect
2007-11-16 20:04:58 +00:00
poll.c
Merged revisions 182847 via svnmerge from
2009-03-18 14:24:27 +00:00
privacy.c
remove a bunch of useless #include "options.h"
2007-11-21 23:09:02 +00:00
rtp.c
Merged revisions 180373 via svnmerge from
2009-03-05 18:36:31 +00:00
say.c
Merged revisions 169794 via svnmerge from
2009-01-21 22:11:11 +00:00
sched.c
Merged revisions 142355 via svnmerge from
2008-09-10 16:42:32 +00:00
sha1.c
more header removal/normalization
2007-11-21 00:23:49 +00:00
slinfactory.c
Merged revisions 171622 via svnmerge from
2009-01-27 20:13:17 +00:00
srv.c
Merged revisions 159818 via svnmerge from
2008-11-29 18:37:55 +00:00
strcompat.c
Merged revisions 105840 via svnmerge from
2008-03-06 00:14:32 +00:00
tcptls.c
Merged revisions 173458 via svnmerge from
2009-02-04 18:55:32 +00:00
tdd.c
Merged revisions 148200 via svnmerge from
2008-10-10 01:25:31 +00:00
term.c
Merged revisions 105840 via svnmerge from
2008-03-06 00:14:32 +00:00
threadstorage.c
Merged revisions 164737 via svnmerge from
2008-12-16 17:15:43 +00:00
translate.c
Merged revisions 181731 via svnmerge from
2009-03-12 17:58:25 +00:00
udptl.c
Merged revisions 175334 via svnmerge from
2009-02-12 21:27:58 +00:00
ulaw.c
another bunch of include removals (errno.h and asterisk/logger.h)
2007-11-19 19:09:03 +00:00
utils.c
Merged revisions 182847 via svnmerge from
2009-03-18 14:24:27 +00:00