Russell Bryant 6335b4b30d Merge changes from team/russell/sla_trunk_moh ... ...

* Added the ability to specify the music on hold class used to play into the
   conference when there is only one member and the M option is used.
* Added the ability to specify a music on hold class to play instead of ringing
   for the SLATrunk application.

(patched by me, and tested internally)


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

2007-11-21 00:21:38 +00:00

..

app_adsiprog.c

move asterisk/paths.h outside asterisk.h and into those files

2007-11-20 23:16:15 +00:00

app_alarmreceiver.c

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

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

app_amd.c

Start untangling header inclusion in a way that does not affect

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

app_authenticate.c

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

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

app_cdr.c

Start untangling header inclusion in a way that does not affect

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

app_chanisavail.c

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

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

app_channelredirect.c

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

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

app_chanspy.c

move asterisk/paths.h outside asterisk.h and into those files

2007-11-20 23:16:15 +00:00

app_controlplayback.c

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

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

app_db.c

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

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

app_dial.c

move asterisk/paths.h outside asterisk.h and into those files

2007-11-20 23:16:15 +00:00

app_dictate.c

move asterisk/paths.h outside asterisk.h and into those files

2007-11-20 23:16:15 +00:00

app_directed_pickup.c

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

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

app_directory.c

move asterisk/paths.h outside asterisk.h and into those files

2007-11-20 23:16:15 +00:00

app_disa.c

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

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

app_dumpchan.c

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

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

app_echo.c

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

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

app_exec.c

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

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

app_externalivr.c

more errno.h removal

2007-11-19 21:12:08 +00:00

app_festival.c

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

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

app_flash.c

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

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

app_followme.c

move asterisk/paths.h outside asterisk.h and into those files

2007-11-20 23:16:15 +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

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

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

app_ices.c

move asterisk/paths.h outside asterisk.h and into those files

2007-11-20 23:16:15 +00:00

app_image.c

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

2007-11-19 18:52:04 +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

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

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

app_meetme.c

Merge changes from team/russell/sla_trunk_moh ...

2007-11-21 00:21:38 +00:00

app_milliwatt.c

more errno.h removal

2007-11-19 21:12:08 +00:00

app_minivm.c

move asterisk/paths.h outside asterisk.h and into those files

2007-11-20 23:16:15 +00:00

app_mixmonitor.c

move asterisk/paths.h outside asterisk.h and into those files

2007-11-20 23:16:15 +00:00

app_morsecode.c

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

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

app_mp3.c

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

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

app_nbscat.c

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

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

app_osplookup.c

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

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

app_page.c

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

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

app_parkandannounce.c

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

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

app_playback.c

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

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

app_privacy.c

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

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

app_queue.c

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

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

app_read.c

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

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

app_readexten.c

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

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

app_readfile.c

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

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

app_record.c

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

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

app_rpt.c

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

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

app_sayunixtime.c

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

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

app_senddtmf.c

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

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

app_sendtext.c

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

2007-11-19 18:52:04 +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

move asterisk/paths.h outside asterisk.h and into those files

2007-11-20 23:16:15 +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

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

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

app_system.c

more errno.h removal

2007-11-19 21:12:08 +00:00

app_talkdetect.c

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

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

app_test.c

move asterisk/paths.h outside asterisk.h and into those files

2007-11-20 23:16:15 +00:00

app_transfer.c

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

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

app_url.c

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

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

app_userevent.c

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

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

app_verbose.c

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

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

app_voicemail.c

move asterisk/paths.h outside asterisk.h and into those files

2007-11-20 23:16:15 +00:00

app_waitforring.c

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

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

app_waitforsilence.c

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

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

app_while.c

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

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

app_zapateller.c

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

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

app_zapbarge.c

more errno.h removal

2007-11-19 21:12:08 +00:00

app_zapras.c

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

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

app_zapscan.c

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

2007-11-19 18:52:04 +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

Fix building of modules under cygwin.

2007-11-20 16:12:10 +00:00

rpt_flow.pdf

remove extraneous svn:executable properties

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