Olle Johansson 8b1543974f Resolve conflicts, prepare for next batch of conflicts ...

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

2006-04-10 19:55:39 +00:00

..

h323

bug updates chan_h323 to some api changes it

2006-04-03 18:36:30 +00:00

misdn

fixed some issues, that appear at higher load

2006-04-10 16:50:20 +00:00

answer.h

remove extraneous svn:executable properties

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

chan_agent.c

since the module API is changing, it's a good time to const-ify the description() and key() return values

2006-04-08 22:01:19 +00:00

chan_alsa.c

since the module API is changing, it's a good time to const-ify the description() and key() return values

2006-04-08 22:01:19 +00:00

chan_features.c

since the module API is changing, it's a good time to const-ify the description() and key() return values

2006-04-08 22:01:19 +00:00

chan_h323.c

since the module API is changing, it's a good time to const-ify the description() and key() return values

2006-04-08 22:01:19 +00:00

chan_iax2.c

since the module API is changing, it's a good time to const-ify the description() and key() return values

2006-04-08 22:01:19 +00:00

chan_local.c

since the module API is changing, it's a good time to const-ify the description() and key() return values

2006-04-08 22:01:19 +00:00

chan_mgcp.c

since the module API is changing, it's a good time to const-ify the description() and key() return values

2006-04-08 22:01:19 +00:00

chan_misdn.c

fixed some issues, that appear at higher load

2006-04-10 16:50:20 +00:00

chan_nbs.c

since the module API is changing, it's a good time to const-ify the description() and key() return values

2006-04-08 22:01:19 +00:00

chan_oss.c

since the module API is changing, it's a good time to const-ify the description() and key() return values

2006-04-08 22:01:19 +00:00

chan_phone.c

since the module API is changing, it's a good time to const-ify the description() and key() return values

2006-04-08 22:01:19 +00:00

chan_sip.c

Resolve conflicts, prepare for next batch of conflicts

2006-04-10 19:55:39 +00:00

chan_skinny.c

since the module API is changing, it's a good time to const-ify the description() and key() return values

2006-04-08 22:01:19 +00:00

chan_vpb.c

since the module API is changing, it's a good time to const-ify the description() and key() return values

2006-04-08 22:01:19 +00:00

chan_zap.c

since the module API is changing, it's a good time to const-ify the description() and key() return values

2006-04-08 22:01:19 +00:00

DialTone.h

remove extraneous svn:executable properties

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

gentone-ulaw.c

remove extraneous svn:executable properties

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

gentone.c

remove extraneous svn:executable properties

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

iax2-parser.c

use string fields for some stuff in ast_channel

2006-02-01 23:05:28 +00:00

iax2-parser.h

use string fields for some stuff in ast_channel

2006-02-01 23:05:28 +00:00

iax2-provision.c

another batch of cli simplifications

2006-03-28 23:33:02 +00:00

iax2-provision.h

useless 'extern' and trailing whitespace removal

2006-03-31 10:11:10 +00:00

iax2.h

remove extraneous svn:executable properties

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

Makefile

merge rizzo's patch to make compiler warnings stop the build, and fix a bunch of warnings found

2006-02-22 22:53:49 +00:00

misdn_config.c

removed dynamic switching from transparent to hdlc mode. Instead we've got a config option hdlc=yes now which enables the hdlc controller for a data call

2006-03-20 18:04:05 +00:00

ring10.h

remove extraneous svn:executable properties

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