Tilghman Lesher 81a24c617b Merged revisions 280811 via svnmerge from ...

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r280811 | tilghman | 2010-08-03 15:49:10 -0500 (Tue, 03 Aug 2010) | 9 lines
  
  Prevent DAHDI channels from overriding the callerid, once it's been set by the user.
  
  (closes issue #16661)
   Reported by: jstapleton
   Patches: 
         20100414__issue16661.diff.txt uploaded by tilghman (license 14)
         20100415__issue16661__1.6.2.diff.txt uploaded by tilghman (license 14)
   Tested by: jstapleton
........


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

2010-08-03 20:52:20 +00:00

..

func_aes.c

Parameter position reversed in documentation

2009-01-30 18:36:56 +00:00

func_audiohookinherit.c

Merged revisions 229670 via svnmerge from

2009-11-12 16:47:12 +00:00

func_base64.c

Merged revisions 228620 via svnmerge from

2009-11-06 20:26:17 +00:00

func_blacklist.c

- Add some see-also references based on TFOT.

2008-11-05 12:13:57 +00:00

func_callerid.c

Merged revisions 280811 via svnmerge from

2010-08-03 20:52:20 +00:00

func_cdr.c

Merged revisions 238231 via svnmerge from

2010-01-06 21:48:49 +00:00

func_channel.c

Merged revisions 250730 via svnmerge from

2010-03-04 20:15:10 +00:00

func_config.c

Merge changes from team/group/appdocsxml

2008-11-01 21:10:07 +00:00

func_curl.c

Merged revisions 212249 via svnmerge from

2009-08-14 17:37:37 +00:00

func_cut.c

AST-2009-005

2009-08-10 19:36:38 +00:00

func_db.c

- Add some see-also references based on TFOT.

2008-11-05 12:13:57 +00:00

func_devstate.c

Merged revisions 193274 via svnmerge from

2009-05-08 15:36:18 +00:00

func_dialgroup.c

Merged revisions 222176 via svnmerge from

2009-10-06 01:39:07 +00:00

func_dialplan.c

AST-2009-005

2009-08-10 19:36:38 +00:00

func_enum.c

AST-2009-005

2009-08-10 19:36:38 +00:00

func_env.c

Fix an off-by-one error in the FILE() function, and extend FILE()'s length parameter to work like variable substitution.

2009-03-16 17:33:38 +00:00

func_extstate.c

Merge changes from team/group/appdocsxml

2008-11-01 21:10:07 +00:00

func_global.c

Merge changes from team/group/appdocsxml

2008-11-01 21:10:07 +00:00

func_groupcount.c

Merged revisions 232269 via svnmerge from

2009-12-02 15:43:27 +00:00

func_iconv.c

Merge changes from team/group/appdocsxml

2008-11-01 21:10:07 +00:00

func_lock.c

Merged revisions 232012 via svnmerge from

2009-12-01 23:40:18 +00:00

func_logic.c

Merged revisions 168546 via svnmerge from

2009-01-13 17:51:12 +00:00

func_math.c

Merged revisions 244331 via svnmerge from

2010-02-02 18:59:37 +00:00

func_md5.c

Merge changes from team/group/appdocsxml

2008-11-01 21:10:07 +00:00

func_module.c

Merge changes from team/group/appdocsxml

2008-11-01 21:10:07 +00:00

func_odbc.c

Merged revisions 267669 via svnmerge from

2010-06-03 19:51:06 +00:00

func_rand.c

AST-2009-005

2009-08-10 19:36:38 +00:00

func_realtime.c

Merged revisions 206808 via svnmerge from

2009-07-16 16:53:10 +00:00

func_sha1.c

Merge changes from team/group/appdocsxml

2008-11-01 21:10:07 +00:00

func_shell.c

Merge changes from team/group/appdocsxml

2008-11-01 21:10:07 +00:00

func_speex.c

Merged revisions 224856 via svnmerge from

2009-10-20 22:11:11 +00:00

func_sprintf.c

AST-2009-005

2009-08-10 19:36:38 +00:00

func_strings.c

LISTFILTER was doubling delimiters on output.

2010-03-10 20:48:33 +00:00

func_sysinfo.c

Fixes sysinfo operator issue also fixed elsewhere in r131445.

2008-07-16 21:54:08 +00:00

func_timeout.c

AST-2009-005

2009-08-10 19:36:38 +00:00

func_uri.c

Merge changes from team/group/appdocsxml

2008-11-01 21:10:07 +00:00

func_version.c

Merge changes from team/group/appdocsxml

2008-11-01 21:10:07 +00:00

func_vmcount.c

Merge changes from team/group/appdocsxml

2008-11-01 21:10:07 +00:00

func_volume.c

Merge changes from team/group/appdocsxml

2008-11-01 21:10:07 +00:00

Makefile

Merged revisions 207680 via svnmerge from

2009-07-21 13:56:35 +00:00