Sean Bright 8c6f79adec Fix merge error. ...

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

2009-10-07 18:00:03 +00:00

..

func_aes.c

Parameter position reversed in documentation

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

func_audiohookinherit.c

Fix a typo in the XML documentation of the AUDIOHOOK_INHERIT dialplan function.

2008-12-28 15:36:25 +00:00

func_base64.c

Merge changes from team/group/appdocsxml

2008-11-01 21:10:07 +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 220629 via svnmerge from

2009-09-27 20:45:24 +00:00

func_cdr.c

Merge changes from team/group/appdocsxml

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

func_channel.c

AST-2009-005

2009-08-10 19:36:38 +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 190057 via svnmerge from

2009-04-22 21:18:40 +00:00

func_iconv.c

Merge changes from team/group/appdocsxml

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

func_lock.c

Recorded merge of revisions 221044 via svnmerge from

2009-09-30 04:41:59 +00:00

func_logic.c

Merged revisions 168546 via svnmerge from

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

func_math.c

AST-2009-005

2009-08-10 19:36:38 +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

AST-2009-005

2009-08-10 19:36:38 +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

AST-2009-005

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

func_sprintf.c

AST-2009-005

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

func_strings.c

Fix merge error.

2009-10-07 18:00:03 +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