]> git.ipfire.org Git - thirdparty/asterisk.git/commit
Merge r379892 into Certified 11.2
authorJonathan Rose <jrose@digium.com>
Fri, 8 Feb 2013 19:42:50 +0000 (19:42 +0000)
committerJonathan Rose <jrose@digium.com>
Fri, 8 Feb 2013 19:42:50 +0000 (19:42 +0000)
commit162b61b8c43f38f33a12ec0770adbe780775acb0
tree6b6e81fa4451f09bc9678cf2240f868c5e7b4136
parent55ec65cb090d39bc13f95d886d30b32a670eb897
Merge r379892 into Certified 11.2
........
  r379892 | jrose | 2013-01-22 13:07:42 -0600 (Tue, 22 Jan 2013) | 16 lines

  app_meetme: Use new prompts for administrator menu

  The old prompts for the administrator menu were inadequate. They didn't mention
  that the menu had additional options through the 8 key and pressing the 8 key
  wouldn't reveal what those options were. This patch fixes all of that while
  also organizing code pertaining to each individual menu type which was
  previously all stored in one gigantic function along with many of the basic
  conference functions.

  (closes issue AST-996)
  Reported by: John Bigelow
  Review: http://reviewboard.digium.internal/r/360/
  ........

  Merged revisions 379885 from http://svn.asterisk.org/svn/asterisk/branches/1.8

------------------------------------------------------------------------

git-svn-id: https://origsvn.digium.com/svn/asterisk/certified/branches/11.2@381085 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_meetme.c
sounds/Makefile