Joshua Colp 90b3566d84 Merged revisions 174219 via svnmerge from ...

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

................
  r174219 | file | 2009-02-09 10:49:24 -0400 (Mon, 09 Feb 2009) | 11 lines
  
  Merged revisions 174218 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r174218 | file | 2009-02-09 10:48:21 -0400 (Mon, 09 Feb 2009) | 4 lines
    
    Don't overwrite our pointer to the music class when music on hold stops. We will use this if it starts again to see if we can resume the music where it left off.
    (closes issue #14407)
    Reported by: mostyn
  ........
................


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

2009-02-09 14:50:50 +00:00

..

ael

Merged revisions 168746 via svnmerge from

2009-01-16 00:47:29 +00:00

ais

Merged revisions 140563 via svnmerge from

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

snmp

Merged revisions 174149 via svnmerge from

2009-02-07 16:18:02 +00:00

Makefile

Merged revisions 157974 via svnmerge from

2008-11-20 00:10:33 +00:00

res_adsi.c

All of the res/ stuff (other than res_jabber) from the RSW branch.

2008-08-10 00:47:56 +00:00

res_ael_share.c

remove a bunch of useless #include "options.h"

2007-11-21 23:09:02 +00:00

res_agi.c

Merged revisions 168517 via svnmerge from

2009-01-12 22:00:32 +00:00

res_ais.c

make the AIS checking a little more generic, and have a more useful configure script command line option for OpenAIS

2008-07-01 17:22:47 +00:00

res_clioriginate.c

Merged revisions 102378 via svnmerge from

2008-02-05 15:10:36 +00:00

res_config_curl.c

Separate the global initialization routines for cURL into its own separate

2008-06-25 16:00:54 +00:00

res_config_ldap.c

All of the res/ stuff (other than res_jabber) from the RSW branch.

2008-08-10 00:47:56 +00:00

res_config_odbc.c

Merged revisions 172131 via svnmerge from

2009-01-28 22:52:49 +00:00

res_config_pgsql.c

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

2008-09-29 00:21:45 +00:00

res_config_sqlite.c

Oops, merge from trunk broke 1.6.1

2009-02-05 23:51:18 +00:00

res_convert.c

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

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

res_crypto.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

res_curl.c

Separate the global initialization routines for cURL into its own separate

2008-06-25 16:00:54 +00:00

res_http_post.c

Merged revisions 168588 via svnmerge from

2009-01-13 23:14:29 +00:00

res_indications.c

Merged revisions 168562 via svnmerge from

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

res_jabber.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

res_limit.c

Janitor project to convert sizeof to ARRAY_LEN macro.

2008-07-08 16:40:28 +00:00

res_monitor.c

Merged revisions 163612 via svnmerge from

2008-12-12 17:26:30 +00:00

res_musiconhold.c

Merged revisions 174219 via svnmerge from

2009-02-09 14:50:50 +00:00

res_odbc.c

Merged revisions 165724 via svnmerge from

2008-12-18 19:36:23 +00:00

res_phoneprov.c

Merged revisions 168142 via svnmerge from

2009-01-09 20:30:21 +00:00

res_realtime.c

Merged revisions 165318 via svnmerge from

2008-12-17 21:25:32 +00:00

res_smdi.c

Merged revisions 146802 via svnmerge from

2008-10-06 21:32:42 +00:00

res_snmp.c

remove a bunch of useless #include "options.h"

2007-11-21 23:09:02 +00:00

res_speech.c

remove a bunch of useless #include "options.h"

2007-11-21 23:09:02 +00:00

res_timing_dahdi.c

- add get_max_rate timing API call

2008-06-26 15:37:01 +00:00

res_timing_pthread.c

Merged revisions 163241 via svnmerge from

2008-12-11 21:24:37 +00:00