kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-08 02:48:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
0a72cfe4407d6015de9a58c6c935e269c747b13c
asterisk/main
History
Jeff Peeler 0a72cfe440 Merged revisions 175298 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r175298 | jpeeler | 2009-02-12 14:48:56 -0600 (Thu, 12 Feb 2009) | 15 lines
  
  Merged revisions 175294 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r175294 | jpeeler | 2009-02-12 14:34:36 -0600 (Thu, 12 Feb 2009) | 9 lines
    
    Fix ParkedCall event information for From field in the case of a blind transfer
    
    If the parker information can not be obtained from the peer, try and see if
    the BLINDTRANSFER channel variable has been set. Previously, a blind transfer
    to the ParkAndAnnounce app would return nothing for the From.
    
    Closes AST-189
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@175299 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-12 20:50:30 +00:00
..
db1-ast
Merged revisions 157974 via svnmerge from
2008-11-20 00:12:32 +00:00
editline
Merged revisions 163762 via svnmerge from
2008-12-12 22:05:16 +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
merge new_loader_completion branch, including (at least):
2006-08-21 02:11:39 +00:00
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 168562 via svnmerge from
2009-01-13 19:27:54 +00:00
ast_expr2.c
Revert some changes that shouldn't have made it in
2009-01-27 16:15:40 +00:00
ast_expr2.fl
Merged revisions 144949-144951 via svnmerge from
2008-09-27 16:36:39 +00:00
ast_expr2.h
Revert some changes that shouldn't have made it in
2009-01-27 16:15:40 +00:00
ast_expr2.y
Merged revisions 168737 via svnmerge from
2009-01-15 21:14:31 +00:00
ast_expr2f.c
port gcc 4.3.x warning fixes from trunk to this branch
2008-11-03 00:39:04 +00:00
asterisk.c
Merged revisions 172441 via svnmerge from
2009-01-29 23:47:00 +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 166162 via svnmerge from
2008-12-19 23:45:26 +00:00
autoservice.c
Merged revisions 163449 via svnmerge from
2008-12-12 14:05:01 +00:00
buildinfo.c
merge new_loader_completion branch, including (at least):
2006-08-21 02:11:39 +00:00
callerid.c
Merged revisions 160945 via svnmerge from
2008-12-04 16:47:19 +00:00
cdr.c
Merged revisions 159360 via svnmerge from
2008-11-25 23:09:11 +00:00
channel.c
Merged revisions 174945 via svnmerge from
2009-02-11 22:48:11 +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 167301 via svnmerge from
2009-01-06 21:38:19 +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
merge new_loader_completion branch, including (at least):
2006-08-21 02:11:39 +00:00
enum.c
Merged revisions 105840 via svnmerge from
2008-03-06 00:14:32 +00:00
event.c
Merged revisions 159818 via svnmerge from
2008-11-29 18:37:55 +00:00
features.c
Merged revisions 175298 via svnmerge from
2009-02-12 20:50:30 +00:00
file.c
Merged revisions 173354 via svnmerge from
2009-02-04 15:30:54 +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
When merging the fix for issue #14118, I found that
2008-12-22 16:30:25 +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 168588 via svnmerge from
2009-01-13 23:11:19 +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 94977 via svnmerge from
2007-12-27 20:11:20 +00:00
jitterbuf.c
Merged revisions 174584 via svnmerge from
2009-02-10 18:19:45 +00:00
loader.c
Merged revisions 134086 via svnmerge from
2008-07-28 16:49:18 +00:00
logger.c
Merged revisions 168014 via svnmerge from
2009-01-09 16:41:36 +00:00
Makefile
Merged revisions 159818 via svnmerge from
2008-11-29 18:37:55 +00:00
manager.c
Merged revisions 174764 via svnmerge from
2009-02-10 21:49:14 +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 174945 via svnmerge from
2009-02-11 22:48:11 +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 140817 via svnmerge from
2008-09-03 13:27:14 +00:00
privacy.c
remove a bunch of useless #include "options.h"
2007-11-21 23:09:02 +00:00
rtp.c
Merged revisions 175125 via svnmerge from
2009-02-12 17:03:21 +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 148612 via svnmerge from
2008-10-14 08:08:17 +00:00
udptl.c
Merged revisions 168604 via svnmerge from
2009-01-14 19:11:56 +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 166317 via svnmerge from
2008-12-22 17:30:05 +00:00