Mark Michelson ece4c95798 Resolve conflict and reset automerge. ...

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

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

..

editline

…

stdtime

Merged revisions 377138 via svnmerge from

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

abstract_jb.c

…

acl.c

…

adsi.c

…

alaw.c

…

aoc.c

Reset automerge property.

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

app.c

…

ast_expr2.c

…

ast_expr2.fl

…

ast_expr2.h

…

ast_expr2.y

…

ast_expr2f.c

…

asterisk.c

Add automerge property back after conflict.

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

asterisk.dynamics

…

asterisk.exports.in

…

astfd.c

…

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

…

autochan.c

…

autoservice.c

…

bridging.c

…

buildinfo.c

…

callerid.c

…

ccss.c

Merged revisions 377035,377040 via svnmerge from

2012-12-03 17:19:46 +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

Fix stuck DTMF when bridge is broken.

2012-11-06 19:05:11 +00:00

channel.c

Reset automerge property.

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

chanvars.c

…

cli.c

Merged revisions 377072,377077 via svnmerge from

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

config_options.c

…

config.c

Merged revisions 377107 via svnmerge from

2012-12-03 20:19:34 +00:00

cygload.c

…

data.c

Reset automerge property.

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

datastore.c

…

db.c

Properly finalize prepared SQLite3 statements to prevent memory leak

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

devicestate.c

…

dial.c

…

dns.c

…

dnsmgr.c

Merged revisions 377707,377711 via svnmerge from

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

dsp.c

…

ecdisa.h

…

enum.c

…

event.c

Merged revisions 377707,377711 via svnmerge from

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

features.c

Merged revisions 377915 via svnmerge from

2012-12-12 05:17:36 +00:00

file.c

Reset automerge property.

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

fixedjitterbuf.c

…

fixedjitterbuf.h

…

format_cap.c

…

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

…

framehook.c

…

fskmodem_float.c

…

fskmodem_int.c

…

fskmodem.c

…

global_datastores.c

…

hashtab.c

…

heap.c

…

http.c

Reset automerge property.

2012-12-11 22:25:21 +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

…

jitterbuf.c

…

libasteriskssl.c

…

libasteriskssl.exports.in

…

loader.c

Add safety NULL pointer check in module user references.

2012-11-05 21:42:49 +00:00

lock.c

Merged revisions 376589 via svnmerge from

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

logger.c

Merged revisions 377774 via svnmerge from

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

Makefile

Add automerge property back after conflict.

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

manager.c

Merged revisions 377324,377329-377330 via svnmerge from

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

md5.c

…

message.c

…

named_acl.c

Merged revisions 377324,377329-377330 via svnmerge from

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

netsock2.c

…

netsock.c

…

pbx.c

Merged revisions 377809 via svnmerge from

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

plc.c

…

poll.c

…

presencestate.c

…

privacy.c

…

rtp_engine.c

Multiple revisions 375993-375994

2012-11-07 19:15:26 +00:00

say.c

…

sched.c

…

security_events.c

Merged revisions 376472 via svnmerge from

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

sha1.c

…

sip_api.c

…

slinfactory.c

…

srv.c

…

strcompat.c

…

strings.c

…

stun.c

Reset automerge property.

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

syslog.c

…

taskprocessor.c

Resolve conflict and reset automerge.

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

tcptls.c

…

tdd.c

…

term.c

…

test.c

Merged revisions 376575 via svnmerge from

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

threadpool.c

Some general cleanup, plus we now send state changes when threads activate.

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

threadstorage.c

…

timing.c

Reset automerge property.

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

translate.c

…

udptl.c

Add automerge property back after conflict.

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

ulaw.c

…

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

…

xmldoc.c

Merged revisions 377506,377512 via svnmerge from

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