Russell Bryant 1b1c2db6bd Merged revisions 168562 via svnmerge from ...

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

................
r168562 | russell | 2009-01-13 13:22:13 -0600 (Tue, 13 Jan 2009) | 10 lines

Merged revisions 168561 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r168561 | russell | 2009-01-13 13:13:05 -0600 (Tue, 13 Jan 2009) | 2 lines

Revert unnecessary indications API change from rev 122314

........

................


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

2009-01-13 19:27:54 +00:00

..

_private.h

3) In addition to merging the changes below, change trunk back to a regular

2008-03-03 15:59:50 +00:00

abstract_jb.h

Merged revisions 135851 via svnmerge from

2008-08-06 00:31:28 +00:00

acl.h

start using asterisk/network.h for network related headers.

2007-11-17 14:11:53 +00:00

adsi.h

A lot of doxygen updates

2007-12-11 14:17:29 +00:00

ael_structs.h

Merged revisions 136746 via svnmerge from

2008-08-08 06:45:43 +00:00

aes_internal.h

use the OpenSSL AES implementation if it's available (unless configured not to)

2007-05-24 22:07:50 +00:00

aes.h

Fix a regression in Asterisk 1.6 related to the use of AES encryption.

2008-02-15 23:14:32 +00:00

agi.h

Merged revisions 157706 via svnmerge from

2008-11-19 13:19:49 +00:00

alaw.h

A lot of doxygen updates

2007-12-11 14:17:29 +00:00

app.h

Merged revisions 166696 via svnmerge from

2008-12-23 20:52:19 +00:00

ast_expr.h

A lot of doxygen updates

2007-12-11 14:17:29 +00:00

ast_version.h

Rename version.h to ast_version.h. Next, I will be re-adding version.h as an

2008-02-26 20:02:14 +00:00

astdb.h

A lot of doxygen updates

2007-12-11 14:17:29 +00:00

astmm.h

Merged revisions 159818 via svnmerge from

2008-11-29 18:37:55 +00:00

astobj2.h

Merged revisions 161427 via svnmerge from

2008-12-05 21:13:44 +00:00

astobj.h

Merged revisions 129987 via svnmerge from

2008-07-14 10:40:53 +00:00

astosp.h

1. Re-format the code.

2006-11-15 20:55:17 +00:00

audiohook.h

Merged revisions 166092,166095 via svnmerge from

2008-12-19 23:04:07 +00:00

autoconfig.h.in

Merged revisions 164257 via svnmerge from

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

callerid.h

A lot of doxygen updates

2007-12-11 14:17:29 +00:00

causes.h

Merged revisions 129152 via svnmerge from

2008-07-08 20:31:43 +00:00

cdr.h

Merged revisions 135821 via svnmerge from

2008-08-05 23:52:14 +00:00

channel.h

Merged revisions 168562 via svnmerge from

2009-01-13 19:27:54 +00:00

chanvars.h

Bug 5858 - Make the chanvars.c functions return a 'const char *'

2005-12-03 19:25:33 +00:00

cli.h

Merged revisions 159818 via svnmerge from

2008-11-29 18:37:55 +00:00

compat.h

Merged revisions 159818 via svnmerge from

2008-11-29 18:37:55 +00:00

compiler.h

Merge revision 153709 from trunk

2008-11-03 00:52:05 +00:00

config.h

Merged revisions 107791 via svnmerge from

2008-03-11 22:59:52 +00:00

crypto.h

Merge a bunch of doxygen updates to header files. This includes changes to

2007-07-16 02:51:56 +00:00

devicestate.h

Merged revisions 159818 via svnmerge from

2008-11-29 18:37:55 +00:00

dial.h

Add an API call that steals the answered channel so that a destruction of the dialing structure does not hang it up.

2008-01-25 02:52:10 +00:00

dns.h

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

dnsmgr.h

start using asterisk/network.h for network related headers.

2007-11-17 14:11:53 +00:00

doxyref.h

Merged revisions 136542 via svnmerge from

2008-08-07 17:44:40 +00:00

dsp.h

Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow.

2008-06-17 18:08:09 +00:00

dundi.h

Merged revisions 159818 via svnmerge from

2008-11-29 18:37:55 +00:00

endian.h

Merged revisions 147899 via svnmerge from

2008-10-09 17:51:25 +00:00

enum.h

Merged revisions 159818 via svnmerge from

2008-11-29 18:37:55 +00:00

event_defs.h

Add API calls for iterating through an event. This should allow events to have multiple information elements (while there was nothing preventing it before you could not actually access any except the first one).

2007-08-29 15:19:11 +00:00

event.h

The documentation page has to be in its own comment block to work, apparently.

2008-02-02 06:10:20 +00:00

extconf.h

Fix up some doxygen issues.

2008-02-15 17:29:08 +00:00

features.h

Merged revisions 166665 via svnmerge from

2008-12-24 00:52:12 +00:00

file.h

When merging the fix for issue #14118, I found that

2008-12-22 16:30:25 +00:00

frame.h

When merging the fix for issue #14118, I found that

2008-12-22 16:30:25 +00:00

fskmodem_float.h

Merged revisions 132510 via svnmerge from

2008-07-21 21:02:25 +00:00

fskmodem_int.h

Merged revisions 132510 via svnmerge from

2008-07-21 21:02:25 +00:00

fskmodem.h

Merged revisions 132511 via svnmerge from

2008-07-21 21:02:55 +00:00

global_datastores.h

Asterisk, when parking can drop rights a caller when a parking timeout occurs. Also, when doing built-in attended transfers, sometimes incorrectly passes rights from the transferrer to the transferee. This patch tries to fixes the parking issue and lays some groundwork for later fixing the transfer issue.

2008-03-01 01:30:37 +00:00

hashtab.h

Merged revisions 144523 via svnmerge from

2008-09-25 21:21:33 +00:00

http.h

Merged revisions 108295 via svnmerge from

2008-03-12 22:50:14 +00:00

image.h

formatting cleanup on the header,

2007-11-23 09:03:33 +00:00

indications.h

Merged revisions 168562 via svnmerge from

2009-01-13 19:27:54 +00:00

inline_api.h

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

io.h

A lot of doxygen updates

2007-12-11 14:17:29 +00:00

jabber.h

Merged revisions 125703 via svnmerge from

2008-06-27 07:41:54 +00:00

jingle.h

Merged revisions 118644 via svnmerge from

2008-05-28 14:13:16 +00:00

linkedlists.h

Merged revisions 159818 via svnmerge from

2008-11-29 18:37:55 +00:00

localtime.h

Added a new module, res_phoneprov, which allows auto-provisioning of phones

2008-01-09 21:37:26 +00:00

lock.h

Merged revisions 126574 via svnmerge from

2008-06-30 16:09:52 +00:00

logger.h

Merged revisions 159818 via svnmerge from

2008-11-29 18:37:55 +00:00

manager.h

Merged revisions 159818 via svnmerge from

2008-11-29 18:37:55 +00:00

md5.h

Start untangling header inclusion in a way that does not affect

2007-11-16 20:04:58 +00:00

mod_format.h

A lot of doxygen updates

2007-12-11 14:17:29 +00:00

module.h

Merged revisions 159818 via svnmerge from

2008-11-29 18:37:55 +00:00

monitor.h

Fix building that was broken by recent monitor.h changes. Thanks Russell for pointing this out (and pointing out what I probably did to prevent gcc from fixing it - don't ctrl-C builds)

2007-07-10 15:07:25 +00:00

musiconhold.h

Merge a bunch of doxygen updates to header files. This includes changes to

2007-07-16 02:51:56 +00:00

netsock.h

HUGE improvements to QoS/CoS handling by IgorG

2007-12-16 10:51:53 +00:00

network.h

some platforms (e.g. FreeBSD4) need netinet/in.h to be included

2007-12-08 03:26:09 +00:00

options.h

Merged revisions 134050 via svnmerge from

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

paths.h

modify http://svn.digium.com/view/asterisk?view=rev&rev=93603

2007-12-20 09:55:05 +00:00

pbx.h

Merged revisions 166665 via svnmerge from

2008-12-24 00:52:12 +00:00

plc.h

Start untangling header inclusion in a way that does not affect

2007-11-16 20:04:58 +00:00

poll-compat.h

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

privacy.h

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

pval.h

Merged revisions 162079 via svnmerge from

2008-12-09 17:27:26 +00:00

res_odbc.h

Merged revisions 159818 via svnmerge from

2008-11-29 18:37:55 +00:00

rtp.h

Merged revisions 105675 via svnmerge from

2008-03-06 00:07:09 +00:00

say.h

Merge a bunch of doxygen updates to header files. This includes changes to

2007-07-16 02:51:56 +00:00

sched.h

Merged revisions 134703 via svnmerge from

2008-07-30 22:41:23 +00:00

sha1.h

Start untangling header inclusion in a way that does not affect

2007-11-16 20:04:58 +00:00

slinfactory.h

Merged revisions 112126 via svnmerge from

2008-04-01 16:57:16 +00:00

smdi.h

Merged revisions 104119 via svnmerge from

2008-02-26 00:31:40 +00:00

speech.h

Merged revisions 79334 via svnmerge from

2007-08-13 21:59:15 +00:00

srv.h

Merged revisions 88862 via svnmerge from

2007-11-06 02:53:13 +00:00

stringfields.h

Merged revisions 162488 via svnmerge from

2008-12-09 23:45:15 +00:00

strings.h

Merged revisions 159818 via svnmerge from

2008-11-29 18:37:55 +00:00

tcptls.h

Merged revisions 123546 via svnmerge from

2008-06-17 21:57:15 +00:00

tdd.h

Additional TDD changes (preparing for SIP changes - adding TDD support to SIP)

2007-11-06 19:10:26 +00:00

term.h

Doxygen updates, formatting.

2007-12-11 22:20:22 +00:00

threadstorage.h

Merged revisions 164737 via svnmerge from

2008-12-16 17:15:43 +00:00

time.h

Fix up some doxygen issues.

2008-02-15 17:29:08 +00:00

transcap.h

Doxygen updates, formatting.

2007-12-11 22:20:22 +00:00

translate.h

Merged revisions 99081 via svnmerge from

2008-01-18 21:38:01 +00:00

udptl.h

Doxygen updates, formatting.

2007-12-11 22:20:22 +00:00

ulaw.h

Doxygen updates, formatting.

2007-12-11 22:20:22 +00:00

unaligned.h

* In unaligned.h, remove some unnecessary casts and mark the arg of the

2007-12-11 16:29:29 +00:00

utils.h

Merged revisions 166282 via svnmerge from

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