David Vossel 119687d05e Merged revisions 237920 via svnmerge from ...

https://origsvn.digium.com/svn/asterisk/trunk

........
  r237920 | dvossel | 2010-01-05 17:08:50 -0600 (Tue, 05 Jan 2010) | 16 lines
  
  fixes holdtime playback issue in app_queue
  
  When reporting hold time, the number of seconds should be mod 60.
  Otherwise audio playback could be something like "2 minutes 123 seconds"
  rather than "2 minutes 3 seconds".
  
  Also, the "minute" sound file is missing, so for the moment until
  that file can be created the "minutes" file is used instead.
  
  (closes issue #16168)
  Reported by: nickilo
  Patches:
        patch-unified-trunk-rev-222176 uploaded by nickilo (license )
  Tested by: nickilo, wonderg
........


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

2010-01-05 23:09:55 +00:00

..

app_adsiprog.c

AST-2009-005

2009-08-10 19:30:55 +00:00

app_alarmreceiver.c

AST-2009-005

2009-08-10 19:30:55 +00:00

app_amd.c

Merged revisions 232356 via svnmerge from

2009-12-02 17:10:13 +00:00

app_authenticate.c

import gcc 4.3.2 warning fixes from trunk, with a few changes specific to this branch

2008-11-02 23:56:13 +00:00

app_cdr.c

whitespace fixes only.

2008-02-09 11:27:10 +00:00

app_chanisavail.c

Merged revisions 229966 via svnmerge from

2009-11-13 17:21:26 +00:00

app_channelredirect.c

Merged revisions 172063 via svnmerge from

2009-01-28 20:56:48 +00:00

app_chanspy.c

Merged revisions 228189 via svnmerge from

2009-11-05 21:24:33 +00:00

app_controlplayback.c

Merged revisions 227368 via svnmerge from

2009-11-03 19:49:31 +00:00

app_dahdibarge.c

AST-2009-005

2009-08-10 19:30:55 +00:00

app_dahdiras.c

build against the now-typedef-free dahdi/user.h, and remove some #ifdefs for features that will always be present in DAHDI

2008-07-29 22:22:13 +00:00

app_dahdiscan.c

More RSW merges. Everything from apps/ except for the big offenders

2008-08-10 14:45:25 +00:00

app_db.c

whitespace fixes only.

2008-02-09 11:27:10 +00:00

app_dial.c

Merged revisions 227829 via svnmerge from

2009-11-04 21:15:46 +00:00

app_dictate.c

Merged revisions 174945 via svnmerge from

2009-02-11 22:55:16 +00:00

app_directed_pickup.c

Merged revisions 218224 via svnmerge from

2009-09-14 15:17:50 +00:00

app_directory.c

Merged revisions 234893 via svnmerge from

2009-12-15 02:42:33 +00:00

app_disa.c

Merged revisions 220289 via svnmerge from

2009-09-24 19:42:33 +00:00

app_dumpchan.c

Modify TIMEOUT() to be accurate down to the millisecond.

2008-05-01 23:06:23 +00:00

app_echo.c

Merged revisions 149588 via svnmerge from

2008-10-15 15:31:03 +00:00

app_exec.c

For the purpose of making the changed syntax to ExecIf easier to transition,

2008-06-06 17:34:21 +00:00

app_externalivr.c

Merged revisions 232587 via svnmerge from

2009-12-03 15:03:20 +00:00

app_fax.c

Merged revisions 235010 via svnmerge from

2009-12-15 14:36:45 +00:00

app_festival.c

Merged revisions 208113 via svnmerge from

2009-07-22 21:45:34 +00:00

app_flash.c

Merged revisions 125132 via svnmerge from

2008-06-25 23:05:28 +00:00

app_followme.c

Merged revisions 218579 via svnmerge from

2009-09-15 16:05:35 +00:00

app_forkcdr.c

Resolve grammatical mistakes in the application description in app_forkcdr.

2009-05-04 17:30:38 +00:00

app_getcpeid.c

Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow.

2008-06-12 17:27:55 +00:00

app_ices.c

Merged revisions 135058 via svnmerge from

2008-08-01 11:47:34 +00:00

app_image.c

Change SendImage() to output a more consistent status variable.

2008-07-28 16:49:29 +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_jack.c

Merged revisions 140566 via svnmerge from

2008-09-02 15:13:10 +00:00

app_macro.c

AST-2009-005

2009-08-10 19:30:55 +00:00

app_meetme.c

Merged revisions 236510 via svnmerge from

2009-12-28 13:15:28 +00:00

app_milliwatt.c

Merged revisions 209839 via svnmerge from

2009-08-01 11:03:52 +00:00

app_minivm.c

AST-2009-005

2009-08-10 19:30:55 +00:00

app_mixmonitor.c

Merged revisions 230509 via svnmerge from

2009-11-19 21:31:57 +00:00

app_morsecode.c

AST-2009-005

2009-08-10 19:30:55 +00:00

app_mp3.c

Merged revisions 182847 via svnmerge from

2009-03-18 14:32:47 +00:00

app_nbscat.c

Merged revisions 182847 via svnmerge from

2009-03-18 14:32:47 +00:00

app_osplookup.c

Fixed compile error with OSP Toolkit 3.6.

2009-12-08 07:40:01 +00:00

app_page.c

Merged revisions 170980 via svnmerge from

2009-01-25 13:40:52 +00:00

app_parkandannounce.c

Merged revisions 170047 via svnmerge from

2009-01-22 15:04:44 +00:00

app_playback.c

Merged revisions 220289 via svnmerge from

2009-09-24 19:42:33 +00:00

app_privacy.c

AST-2009-005

2009-08-10 19:30:55 +00:00

app_queue.c

Merged revisions 237920 via svnmerge from

2010-01-05 23:09:55 +00:00

app_read.c

Merged revisions 180032 via svnmerge from

2009-03-03 23:39:25 +00:00

app_readexten.c

Merged revisions 168562 via svnmerge from

2009-01-13 19:35:59 +00:00

app_readfile.c

AST-2009-005

2009-08-10 19:30:55 +00:00

app_record.c

AST-2009-005

2009-08-10 19:30:55 +00:00

app_rpt.c

AST-2009-005

2009-08-10 19:30:55 +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

Merged revisions 184079 via svnmerge from

2009-03-24 22:42:00 +00:00

app_sendtext.c

Merged revisions 187363 via svnmerge from

2009-04-09 16:41:23 +00:00

app_setcallerid.c

AST-2009-005

2009-08-10 19:30:55 +00:00

app_skel.c

Re-introduce proper error handling that was removed in recent commits.

2008-05-13 17:42:17 +00:00

app_sms.c

AST-2009-005

2009-08-10 19:30:55 +00:00

app_softhangup.c

Merged revisions 229460 via svnmerge from

2009-11-11 18:26:11 +00:00

app_speech_utils.c

Merged revisions 179254 via svnmerge from

2009-03-01 23:28:19 +00:00

app_stack.c

Merged revisions 236300 via svnmerge from

2009-12-23 18:26:57 +00:00

app_system.c

Merged revisions 177664 via svnmerge from

2009-02-20 21:35:18 +00:00

app_talkdetect.c

AST-2009-005

2009-08-10 19:30:55 +00:00

app_test.c

Merged revisions 184389 via svnmerge from

2009-03-26 21:18:39 +00:00

app_transfer.c

Merged revisions 152132 via svnmerge from

2008-10-27 16:06:01 +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

Merged revisions 169365 via svnmerge from

2009-01-19 20:10:13 +00:00

app_verbose.c

AST-2009-005

2009-08-10 19:30:55 +00:00

app_voicemail.c

Merged revisions 236667 via svnmerge from

2009-12-28 17:40:11 +00:00

app_waitforring.c

AST-2009-005

2009-08-10 19:30:55 +00:00

app_waitforsilence.c

AST-2009-005

2009-08-10 19:30:55 +00:00

app_waituntil.c

AST-2009-005

2009-08-10 19:30:55 +00:00

app_while.c

Merged revisions 156756 via svnmerge from

2008-11-14 00:44:10 +00:00

app_zapateller.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 201783 via svnmerge from

2009-06-18 20:54:10 +00:00

rpt_flow.pdf

remove extraneous svn:executable properties

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