Automerge script f7e1073af5 Merged revisions 378874 via svnmerge from ...

file:///srv/subversion/repos/asterisk/trunk

........
  r378874 | rmudgett | 2013-01-09 19:43:27 -0600 (Wed, 09 Jan 2013) | 4 lines
  
  * Removed some noop code and restructured an else-if ladder in ast_generic_bridge().
  
  * Trivial changes in ast_channel_bridge().
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@378883 65c4cc65-6c06-0410-ace0-fbb531ad65f3

2013-01-10 02:20:50 +00:00

..

editline

Enable usage of system-provided NetBSD editline library if available.

2012-07-25 12:21:54 +00:00

stdtime

Merged revisions 377138 via svnmerge from

2012-12-03 21:19:40 +00:00

abstract_jb.c

Unit tests for the Jitter Buffer API; remove unnecessary resync

2012-07-23 21:15:26 +00:00

acl.c

Trivial patch to make 'best_score' defined for all architectures.

2012-10-07 17:33:38 +00:00

adsi.c

Fix crash in unloading of res_adsi module

2012-06-26 13:23:12 +00:00

alaw.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

aoc.c

Reset automerge property.

2012-12-11 22:25:21 +00:00

app.c

core: Fix a memory leak in app.c from an early return

2012-10-22 20:19:51 +00:00

ast_expr2.c

Allow the REALTIME() function to report errors back to the caller.

2012-07-11 17:16:50 +00:00

ast_expr2.fl

Avoid cppcheck warnings; removing unused vars and a bit of cleanup.

2012-04-17 18:57:40 +00:00

ast_expr2.h

Allow the REALTIME() function to report errors back to the caller.

2012-07-11 17:16:50 +00:00

ast_expr2.y

Multiple revisions 360356-360357

2012-03-24 02:42:42 +00:00

ast_expr2f.c

Doxygen Updates - janitor work

2012-09-21 17:14:59 +00:00

asterisk.c

Add automerge property back after conflict.

2012-12-11 21:52:09 +00:00

asterisk.dynamics

…

asterisk.exports.in

Add new config-parsing framework

2012-06-01 16:33:25 +00:00

astfd.c

Doxygen Updates Janitor Work

2012-09-22 20:43:30 +00:00

astmm.c

Merged revisions 377402 via svnmerge from

2012-12-08 00:19:39 +00:00

astobj2.c

Merged revisions 376575 via svnmerge from

2012-11-21 19:20:22 +00:00

audiohook.c

Doxygen Updates Janitor Work

2012-09-22 20:43:30 +00:00

autochan.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

autoservice.c

Hangup handlers - Dialplan subroutines that run when the channel hangs up.

2012-06-29 17:02:32 +00:00

bridging.c

Merged revisions 378840 via svnmerge from

2013-01-09 23:20:35 +00:00

buildinfo.c

…

callerid.c

Allow for redirecting reasons to be set to arbitrary strings.

2012-09-25 19:29:14 +00:00

ccss.c

Merged revisions 378322 via svnmerge from

2013-01-02 18:20:03 +00:00

cdr.c

Merged revisions 377072,377077 via svnmerge from

2012-12-03 19:19:39 +00:00

cel.c

Reset automerge property.

2012-12-11 22:25:21 +00:00

channel_internal_api.c

Merged revisions 378322 via svnmerge from

2013-01-02 18:20:03 +00:00

channel.c

Merged revisions 378874 via svnmerge from

2013-01-10 02:20:50 +00:00

chanvars.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

cli.c

Merged revisions 377072,377077 via svnmerge from

2012-12-03 19:19:39 +00:00

config_options.c

Fix a variety of ref counting issues

2012-10-02 01:47:16 +00:00

config.c

Merged revisions 378374,378377,378384 via svnmerge from

2013-01-02 22:19:49 +00:00

cygload.c

Kill off red blobs in most of main/*

2012-03-22 19:51:16 +00:00

data.c

Reset automerge property.

2012-12-11 22:25:21 +00:00

datastore.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

db.c

Properly finalize prepared SQLite3 statements to prevent memory leak

2012-11-04 01:19:43 +00:00

devicestate.c

Merged revisions 378322 via svnmerge from

2013-01-02 18:20:03 +00:00

dial.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

dns.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

dnsmgr.c

Merged revisions 377707,377711 via svnmerge from

2012-12-11 01:19:39 +00:00

dsp.c

Doxygen Updates - Title update

2012-10-18 14:17:40 +00:00

ecdisa.h

Kill off red blobs in most of main/*

2012-03-22 19:51:16 +00:00

enum.c

Doxygen Updates - Title update

2012-10-18 14:17:40 +00:00

event.c

Merged revisions 378322 via svnmerge from

2013-01-02 18:20:03 +00:00

features.c

Merged revisions 378374,378377,378384 via svnmerge from

2013-01-02 22:19:49 +00:00

file.c

Reset automerge property.

2012-12-11 22:25:21 +00:00

fixedjitterbuf.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

fixedjitterbuf.h

Kill off red blobs in most of main/*

2012-03-22 19:51:16 +00:00

format_cap.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

format_pref.c

Things don't need to be that const.

2012-11-02 21:01:33 +00:00

format.c

Merged revisions 377245-377246 via svnmerge from

2012-12-05 03:19:08 +00:00

frame.c

Rewrite a comment that didn't adequately explain the code it was documenting.

2012-07-24 16:54:26 +00:00

framehook.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

fskmodem_float.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

fskmodem_int.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

fskmodem.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

global_datastores.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

hashtab.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

heap.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

http.c

Merged revisions 378288 via svnmerge from

2013-01-02 16:20:01 +00:00

image.c

Reset automerge property.

2012-12-11 22:25:21 +00:00

indications.c

Merged revisions 377743 via svnmerge from

2012-12-11 02:19:39 +00:00

io.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

jitterbuf.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

libasteriskssl.c

Resolve memory leaks in TLS initialization and TLS client connections

2012-09-14 19:53:43 +00:00

libasteriskssl.exports.in

Address OpenSSL initialization issues when using third-party libraries.

2012-01-30 21:21:16 +00:00

loader.c

Merged revisions 378091,378095 via svnmerge from

2012-12-17 23:18:40 +00:00

lock.c

Merged revisions 376589 via svnmerge from

2012-11-23 00:20:55 +00:00

logger.c

Merged revisions 378854,378858-378859 via svnmerge from

2013-01-10 00:20:46 +00:00

Makefile

Merged revisions 378072,378074 via svnmerge from

2012-12-17 21:18:01 +00:00

manager.c

Merged revisions 378374,378377,378384 via svnmerge from

2013-01-02 22:19:49 +00:00

md5.c

md5: supress some compiler warnings.

2012-04-28 01:33:49 +00:00

message.c

Update documentation for MessageSend application/command's From field for XMPP

2012-10-06 01:47:00 +00:00

named_acl.c

Merged revisions 377324,377329-377330 via svnmerge from

2012-12-06 15:19:58 +00:00

netsock2.c

Fix NULL pointer segfault in ast_sockaddr_parse()

2012-06-20 02:07:00 +00:00

netsock.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

pbx.c

Merged revisions 377809 via svnmerge from

2012-12-11 20:20:16 +00:00

plc.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

poll.c

…

presencestate.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

privacy.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

rtp_engine.c

Merged revisions 378783,378789-378790 via svnmerge from

2013-01-09 21:21:11 +00:00

say.c

Fix saying of date in Dutch.

2012-09-25 23:10:22 +00:00

sched.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

security_events.c

Merged revisions 376472 via svnmerge from

2012-11-19 20:20:36 +00:00

sha1.c

Doxygen Updates - janitor work

2012-09-21 17:14:59 +00:00

sip_api.c

Don't make chan_sip export global symbols.

2012-10-11 15:49:02 +00:00

slinfactory.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

srv.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

strcompat.c

Clean up and ensure proper usage of alloca()

2012-07-31 20:21:43 +00:00

strings.c

Doxygen Updates - janitor work

2012-09-21 17:14:59 +00:00

stun.c

Reset automerge property.

2012-12-11 22:25:21 +00:00

syslog.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

taskprocessor.c

Remove tasks from the taskprocessor and free them when taskprocessor is destroyed.

2013-01-07 23:11:41 +00:00

tcptls.c

Ensure Asterisk fails TCP/TLS SIP calls when certificate checking fails

2012-10-17 19:01:27 +00:00

tdd.c

Doxygen Updates - janitor work

2012-09-21 17:14:59 +00:00

term.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

test.c

Merged revisions 378823 via svnmerge from

2013-01-09 22:20:40 +00:00

threadpool.c

Address review board feedback from Matt and Richard

2013-01-07 22:16:06 +00:00

threadstorage.c

Clean up and ensure proper usage of alloca()

2012-07-31 20:21:43 +00:00

timing.c

Reset automerge property.

2012-12-11 22:25:21 +00:00

translate.c

Add support for parsing SDP attributes, generating SDP attributes, and passing it through.

2012-07-13 16:49:40 +00:00

udptl.c

Merged revisions 378783,378789-378790 via svnmerge from

2013-01-09 21:21:11 +00:00

ulaw.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

utils.c

Resolve conflict and reset automerge.

2012-12-13 16:39:40 +00:00

uuid.c

Add automerge property back after conflict.

2012-12-11 21:52:09 +00:00

xml.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

xmldoc.c

Merged revisions 377506,377512 via svnmerge from

2012-12-10 02:20:30 +00:00