Mark Michelson 2e1a3be9e4 Merged revisions 187046 via svnmerge from ...

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

................
  r187046 | mmichelson | 2009-04-08 11:52:20 -0500 (Wed, 08 Apr 2009) | 16 lines
  
  Merged revisions 187045 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r187045 | mmichelson | 2009-04-08 11:52:03 -0500 (Wed, 08 Apr 2009) | 10 lines
    
    Fix a small logical error when loading moh classes.
    
    We were unconditionally incrementing the number of mohclasses
    registered. However, we should actually only increment if the
    call to moh_register was successful.
    
    While this probably has never caused problems, I noticed it
    and decided to fix it anyway.
  ........
................


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

2009-04-08 16:53:26 +00:00

..

ael

Merged revisions 177286 via svnmerge from

2009-02-19 00:17:44 +00:00

ais

Merged revisions 184630 via svnmerge from

2009-03-27 14:04:56 +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 184673 via svnmerge from

2009-03-27 15:54:22 +00:00

res_ais.c

Merged revisions 179164 via svnmerge from

2009-02-27 21:48:00 +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 183766 via svnmerge from

2009-03-23 18:59:30 +00:00

res_musiconhold.c

Merged revisions 187046 via svnmerge from

2009-04-08 16:53:26 +00:00

res_odbc.c

Merged revisions 176592,176642 via svnmerge from

2009-02-17 21:16:53 +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

Merged revisions 179937 via svnmerge from

2009-03-03 21:00:46 +00:00

res_timing_pthread.c

Merged revisions 176666 via svnmerge from

2009-02-17 21:24:17 +00:00