Joshua Colp 2ad2f92405 Merged revisions 97450 via svnmerge from ...

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r97450 | file | 2008-01-09 12:11:17 -0400 (Wed, 09 Jan 2008) | 6 lines

Don't do conferencing totally in Zaptel if Monitor is running on the channel.
(closes issue #11709)
Reported by: BigJimmy
Patches:
      patch-meetmerec uploaded by BigJimmy (license 371)

........


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

2008-01-09 16:13:24 +00:00

..

app_adsiprog.c

Use defined return values in load_module in more places.

2007-12-26 20:02:27 +00:00

app_alarmreceiver.c

Use defined return values in load_module in more places.

2007-12-26 20:02:27 +00:00

app_amd.c

Some changes to app_amd.

2007-12-28 16:12:06 +00:00

app_authenticate.c

Use defined return values in load_module in more places.

2007-12-26 20:02:27 +00:00

app_cdr.c

Use defined return values in load_module in more places.

2007-12-26 20:02:27 +00:00

app_chanisavail.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_channelredirect.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_chanspy.c

Convert ast_verbose to ast_verb.

2007-12-14 14:48:38 +00:00

app_controlplayback.c

Add variable to show which key was pressed to stop playback.

2007-12-11 21:17:37 +00:00

app_db.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_dial.c

Convert ast_verbose to ast_verb.

2007-12-14 14:48:38 +00:00

app_dictate.c

remove more unnecessary casts for NULL.

2007-12-27 23:32:18 +00:00

app_directed_pickup.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_directory.c

Resolve compiler warnings.

2007-12-05 17:44:59 +00:00

app_disa.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_dumpchan.c

shuffle a little bit the content of header files to reduce dependencies.

2007-11-22 03:50:04 +00:00

app_echo.c

more header removal

2007-11-22 04:37:08 +00:00

app_exec.c

Make 'else' argument to ExecIf optional. Clean up the description and usage text a bit.

2007-12-26 22:14:21 +00:00

app_externalivr.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_festival.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_flash.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_followme.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_forkcdr.c

include "logger.h" and errno.h from asterisk.h - usage shows that they

2007-11-19 18:52:04 +00:00

app_getcpeid.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_ices.c

Compatibility fix for OpenBSD

2008-01-03 01:59:27 +00:00

app_image.c

remove redundant headers

2007-11-22 01:39:06 +00:00

app_ivrdemo.c

include "logger.h" and errno.h from asterisk.h - usage shows that they

2007-11-19 18:52:04 +00:00

app_macro.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_meetme.c

Merged revisions 97450 via svnmerge from

2008-01-09 16:13:24 +00:00

app_milliwatt.c

more header removal

2007-11-22 04:37:08 +00:00

app_minivm.c

Convert ast_verbose to ast_verb.

2007-12-14 14:48:38 +00:00

app_mixmonitor.c

Convert ast_verbose to ast_verb.

2007-12-14 14:48:38 +00:00

app_morsecode.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_mp3.c

Compatibility fix for OpenBSD

2008-01-03 01:59:27 +00:00

app_nbscat.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_osplookup.c

Update osplookup documentation to use commas instead of pipes.

2008-01-02 17:38:02 +00:00

app_page.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_parkandannounce.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_pickupchan.c

- Add Copyright

2007-12-27 09:08:23 +00:00

app_playback.c

Merged revisions 89618 via svnmerge from

2007-11-26 23:11:29 +00:00

app_privacy.c

Remove use of privacy.conf by the Privacy app.

2007-12-14 19:27:54 +00:00

app_queue.c

Merged revisions 97308 via svnmerge from

2008-01-09 00:18:15 +00:00

app_read.c

shuffle a little bit the content of header files to reduce dependencies.

2007-11-22 03:50:04 +00:00

app_readexten.c

shuffle a little bit the content of header files to reduce dependencies.

2007-11-22 03:50:04 +00:00

app_readfile.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_record.c

shuffle a little bit the content of header files to reduce dependencies.

2007-11-22 03:50:04 +00:00

app_rpt.c

Change instances of AST_NONSTANDARD_APP_ARGS(foo, bar, ',') to AST_STANDARD_APP_ARGS(foo, bar)

2008-01-02 21:08:33 +00:00

app_sayunixtime.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_senddtmf.c

shuffle a little bit the content of header files to reduce dependencies.

2007-11-22 03:50:04 +00:00

app_sendtext.c

more header removal

2007-11-22 04:37:08 +00:00

app_setcallerid.c

include "logger.h" and errno.h from asterisk.h - usage shows that they

2007-11-19 18:52:04 +00:00

app_skel.c

include "logger.h" and errno.h from asterisk.h - usage shows that they

2007-11-19 18:52:04 +00:00

app_sms.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_softhangup.c

include "logger.h" and errno.h from asterisk.h - usage shows that they

2007-11-19 18:52:04 +00:00

app_speech_utils.c

include "logger.h" and errno.h from asterisk.h - usage shows that they

2007-11-19 18:52:04 +00:00

app_stack.c

shuffle a little bit the content of header files to reduce dependencies.

2007-11-22 03:50:04 +00:00

app_system.c

shuffle a little bit the content of header files to reduce dependencies.

2007-11-22 03:50:04 +00:00

app_talkdetect.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_test.c

remove a number of #include <fcntl.h> which are either

2007-11-22 01:03:02 +00:00

app_transfer.c

shuffle a little bit the content of header files to reduce dependencies.

2007-11-22 03:50:04 +00:00

app_url.c

shuffle a little bit the content of header files to reduce dependencies.

2007-11-22 03:50:04 +00:00

app_userevent.c

remove redundant headers

2007-11-22 01:39:06 +00:00

app_verbose.c

more header removal

2007-11-22 04:37:08 +00:00

app_voicemail.c

Add a new flag 'd' (with optional context) permitting any extension within

2008-01-08 23:51:51 +00:00

app_waitforring.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_waitforsilence.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

app_waituntil.c

Add contributed WaitUntil app.

2007-12-19 20:06:23 +00:00

app_while.c

shuffle a little bit the content of header files to reduce dependencies.

2007-11-22 03:50:04 +00:00

app_zapateller.c

Use defined return values in load_module in more places.

2007-12-26 20:02:27 +00:00

app_zapbarge.c

Use defined return values in load_module in more places.

2007-12-26 20:02:27 +00:00

app_zapras.c

Use defined return values in load_module in more places.

2007-12-26 20:02:27 +00:00

app_zapscan.c

Use defined return values in load_module in more places.

2007-12-26 20:02:27 +00:00

enter.h

remove extraneous svn:executable properties

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

leave.h

remove extraneous svn:executable properties

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

Makefile

Merged revisions 93180 via svnmerge from

2007-12-17 07:25:35 +00:00

rpt_flow.pdf

remove extraneous svn:executable properties

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