Jeff Peeler ab4aba0fb5 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.1@175300 65c4cc65-6c06-0410-ace0-fbb531ad65f3

2009-02-12 20:51:45 +00:00

..

db1-ast

Merged revisions 157974 via svnmerge from

2008-11-20 00:10:33 +00:00

editline

Merged revisions 163762 via svnmerge from

2008-12-12 22:05:58 +00:00

stdtime

Merged revisions 157974 via svnmerge from

2008-11-20 00:10:33 +00:00

abstract_jb.c

Another big chunk of changes from the RSW branch. Bunch of stuff from main/

2008-08-10 19:35:50 +00:00

acl.c

Another big chunk of changes from the RSW branch. Bunch of stuff from main/

2008-08-10 19:35:50 +00:00

adsistub.c

…

aescrypt.c

…

aeskey.c

…

aesopt.h

…

aestab.c

…

alaw.c

…

app.c

Merged revisions 172441 via svnmerge from

2009-01-29 23:53:12 +00:00

ast_expr2.c

revert revision 173964

2009-02-06 17:04:04 +00:00

ast_expr2.fl

Merged revisions 144949-144951 via svnmerge from

2008-09-27 16:49:27 +00:00

ast_expr2.h

revert revision 173964

2009-02-06 17:04:04 +00:00

ast_expr2.y

Merged revisions 168737 via svnmerge from

2009-01-15 21:23:18 +00:00

ast_expr2f.c

import gcc 4.3.2 warning fixes from trunk, with a few changes specific to this branch

2008-11-02 23:56:13 +00:00

asterisk.c

Merged revisions 172441 via svnmerge from

2009-01-29 23:53:12 +00:00

astmm.c

Merged revisions 157632 via svnmerge from

2008-11-19 01:00:44 +00:00

astobj2.c

Merged revisions 175121 via svnmerge from

2009-02-12 16:35:30 +00:00

audiohook.c

Merged revisions 173902 via svnmerge from

2009-02-06 16:01:01 +00:00

autoservice.c

Merged revisions 163449 via svnmerge from

2008-12-12 14:48:40 +00:00

buildinfo.c

…

callerid.c

Merged revisions 160945 via svnmerge from

2008-12-04 16:48:24 +00:00

cdr.c

Merged revisions 159360 via svnmerge from

2008-11-25 23:27:08 +00:00

channel.c

Merged revisions 174945 via svnmerge from

2009-02-11 22:55:16 +00:00

chanvars.c

Merged revisions 149199 via svnmerge from

2008-10-14 22:42:17 +00:00

cli.c

Merged revisions 160208 via svnmerge from

2008-12-02 00:58:43 +00:00

config.c

Merged revisions 161181 via svnmerge from

2008-12-05 05:42:29 +00:00

cryptostub.c

Merged revisions 148200 via svnmerge from

2008-10-10 01:33:34 +00:00

cygload.c

…

datastore.c

make datastore creation and destruction a generic API since it is not really channel related, and add the ability to add/find/remove datastores to manager sessions

2008-08-05 16:56:11 +00:00

db.c

Merged revisions 167301 via svnmerge from

2009-01-06 21:38:45 +00:00

devicestate.c

actually use the cache_cache argument

2008-07-26 15:16:20 +00:00

dial.c

This commit contains the bug fixes and documentation updates

2008-10-31 20:10:40 +00:00

dns.c

Merged revisions 159818 via svnmerge from

2008-11-29 18:16:50 +00:00

dnsmgr.c

Merged revisions 166268 via svnmerge from

2008-12-22 16:10:22 +00:00

dsp.c

Merged revisions 158857 via svnmerge from

2008-11-24 21:53:28 +00:00

ecdisa.h

…

enum.c

The following patch adds new options and alters the default behavior of the ENUM* functions. The TXCIDNAME lookup function has also gotten a

2008-05-09 19:54:45 +00:00

event.c

Merged revisions 159818 via svnmerge from

2008-11-29 18:16:50 +00:00

features.c

Merged revisions 175298 via svnmerge from

2009-02-12 20:51:45 +00:00

file.c

Merged revisions 173354 via svnmerge from

2009-02-04 15:31:26 +00:00

fixedjitterbuf.c

…

fixedjitterbuf.h

Merged revisions 135841,135847,135850 via svnmerge from

2008-08-06 00:30:53 +00:00

frame.c

Merged revisions 164519 via svnmerge from

2008-12-15 22:00:33 +00:00

fskmodem_float.c

Optionally build integer-based routines for FSK tone decoding (but default

2008-07-21 20:59:03 +00:00

fskmodem_int.c

Optionally build integer-based routines for FSK tone decoding (but default

2008-07-21 20:59:03 +00:00

fskmodem.c

(Step 2 of 2)

2008-07-21 21:00:47 +00:00

global_datastores.c

Merged revisions 172580 via svnmerge from

2009-01-31 00:05:17 +00:00

hashtab.c

Merged revisions 149199 via svnmerge from

2008-10-14 22:42:17 +00:00

http.c

Merged revisions 169080 via svnmerge from

2009-01-17 01:59:37 +00:00

image.c

…

indications.c

Merged revisions 168562 via svnmerge from

2009-01-13 19:35:59 +00:00

io.c

…

jitterbuf.c

Merged revisions 174584 via svnmerge from

2009-02-10 18:18:23 +00:00

loader.c

remove remaining Zaptel references in various places

2008-07-28 16:42:00 +00:00

logger.c

Merged revisions 168014 via svnmerge from

2009-01-09 16:41:28 +00:00

Makefile

Merged revisions 159818 via svnmerge from

2008-11-29 18:16:50 +00:00

manager.c

Merged revisions 174764 via svnmerge from

2009-02-10 21:54:45 +00:00

md5.c

…

netsock.c

Make OpenBSD compile again

2008-06-19 20:25:37 +00:00

pbx.c

Merged revisions 174945 via svnmerge from

2009-02-11 22:55:16 +00:00

plc.c

…

poll.c

Merged revisions 140817 via svnmerge from

2008-09-03 13:27:33 +00:00

privacy.c

…

rtp.c

Merged revisions 175125 via svnmerge from

2009-02-12 17:08:25 +00:00

say.c

Merged revisions 169794 via svnmerge from

2009-01-21 22:11:29 +00:00

sched.c

Merged revisions 142355 via svnmerge from

2008-09-10 16:42:52 +00:00

sha1.c

…

slinfactory.c

Merged revisions 171622 via svnmerge from

2009-01-27 20:14:49 +00:00

srv.c

Merged revisions 168523 via svnmerge from

2009-01-12 23:13:13 +00:00

strcompat.c

…

taskprocessor.c

Merged revisions 157041 via svnmerge from

2008-11-15 04:30:42 +00:00

tcptls.c

Merged revisions 173458 via svnmerge from

2009-02-04 18:52:27 +00:00

tdd.c

Merged revisions 148200 via svnmerge from

2008-10-10 01:33:34 +00:00

term.c

…

threadstorage.c

Merged revisions 164737 via svnmerge from

2008-12-16 17:18:12 +00:00

timing.c

- add get_max_rate timing API call

2008-06-26 15:37:01 +00:00

translate.c

Merged revisions 148612 via svnmerge from

2008-10-14 08:08:40 +00:00

udptl.c

Merged revisions 168604 via svnmerge from

2009-01-14 19:12:33 +00:00

ulaw.c

…

utils.c

Merged revisions 166317 via svnmerge from

2008-12-22 17:32:14 +00:00