Philippe Sultan 8c1b4ef44d Merged revisions 120676 via svnmerge from ...

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

................
r120676 | phsultan | 2008-06-05 19:02:39 +0200 (Thu, 05 Jun 2008) | 10 lines

Merged revisions 120675 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r120675 | phsultan | 2008-06-05 18:56:15 +0200 (Thu, 05 Jun 2008) | 2 lines

Ignore appended resource when comparing JIDs.

........

................


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

2008-06-05 17:17:28 +00:00

..

ael

Merged revisions 119930 via svnmerge from

2008-06-03 15:12:28 +00:00

snmp

Merged revisions 105572 via svnmerge from

2008-03-03 18:08:05 +00:00

Makefile

Merged revisions 107373 via svnmerge from

2008-03-11 11:39:32 +00:00

res_adsi.c

Only reload if the config file has changed.

2007-12-01 01:37:50 +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 120602 via svnmerge from

2008-06-05 16:01:32 +00:00

res_clioriginate.c

Merged revisions 102378 via svnmerge from

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

res_config_curl.c

Merged revisions 107791 via svnmerge from

2008-03-11 22:59:52 +00:00

res_config_ldap.c

Merged revisions 118302 via svnmerge from

2008-05-27 13:30:59 +00:00

res_config_odbc.c

Merged revisions 107791 via svnmerge from

2008-03-11 22:59:52 +00:00

res_config_pgsql.c

Merged revisions 114830 via svnmerge from

2008-04-29 17:11:57 +00:00

res_config_sqlite.c

Merged revisions 111961 via svnmerge from

2008-03-31 14:22:27 +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

make configuration variable const so they are not accidentally

2007-12-18 10:24:58 +00:00

res_indications.c

Merged revisions 109447 via svnmerge from

2008-03-18 15:58:50 +00:00

res_jabber.c

Merged revisions 120676 via svnmerge from

2008-06-05 17:17:28 +00:00

res_limit.c

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

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

res_monitor.c

Fix another spot where a hard-coded '|' hadn't been converted to ','

2008-02-20 15:21:51 +00:00

res_musiconhold.c

Merged revisions 115419 via svnmerge from

2008-05-06 19:39:11 +00:00

res_odbc.c

Merged revisions 118129 via svnmerge from

2008-05-23 18:15:41 +00:00

res_phoneprov.c

Merged revisions 109447 via svnmerge from

2008-03-18 15:58:50 +00:00

res_realtime.c

Merged revisions 109447 via svnmerge from

2008-03-18 15:58:50 +00:00

res_smdi.c

Merged revisions 117136 via svnmerge from

2008-05-19 16:58:10 +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