David Vossel fef3a66bf6 Merged revisions 229670 via svnmerge from ...

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

................
  r229670 | dvossel | 2009-11-12 10:44:39 -0600 (Thu, 12 Nov 2009) | 12 lines
  
  Merged revisions 229669 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r229669 | dvossel | 2009-11-12 10:41:49 -0600 (Thu, 12 Nov 2009) | 6 lines
    
    fixes merging error, datastore was being freed in the wrong function.
    
    (closes issue #16219)
    Reported by: aragon
  ........
................


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

2009-11-12 16:49:52 +00:00

..

func_audiohookinherit.c

Merged revisions 229670 via svnmerge from

2009-11-12 16:49:52 +00:00

func_base64.c

Merged revisions 228620 via svnmerge from

2009-11-06 20:42:05 +00:00

func_blacklist.c

remove some useless includes

2007-11-22 02:30:58 +00:00

func_callerid.c

Merged revisions 160856 via svnmerge from

2008-12-04 01:38:08 +00:00

func_cdr.c

Merged revisions 122091 via svnmerge from

2008-06-12 14:38:46 +00:00

func_channel.c

AST-2009-005

2009-08-10 19:25:03 +00:00

func_curl.c

Merged revisions 134541 via svnmerge from

2008-07-30 19:56:24 +00:00

func_cut.c

AST-2009-005

2009-08-10 19:25:03 +00:00

func_db.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

func_devstate.c

Merged revisions 193274 via svnmerge from

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

func_dialgroup.c

Merged revisions 222176 via svnmerge from

2009-10-06 01:33:01 +00:00

func_dialplan.c

AST-2009-005

2009-08-10 19:25:03 +00:00

func_enum.c

AST-2009-005

2009-08-10 19:25:03 +00:00

func_env.c

Merged revisions 182278 via svnmerge from

2009-03-16 17:36:51 +00:00

func_extstate.c

Start untangling header inclusion in a way that does not affect

2007-11-16 20:04:58 +00:00

func_global.c

Merged revisions 105899 via svnmerge from

2008-03-06 00:15:54 +00:00

func_groupcount.c

Merged revisions 190057 via svnmerge from

2009-04-22 21:17:29 +00:00

func_iconv.c

implement "configure" checks for libiconv, and add the

2008-01-01 22:08:32 +00:00

func_lock.c

Recorded merge of revisions 221044 via svnmerge from

2009-09-30 04:34:45 +00:00

func_logic.c

Merged revisions 168547 via svnmerge from

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

func_math.c

AST-2009-005

2009-08-10 19:25:03 +00:00

func_md5.c

remove some useless includes

2007-11-22 02:30:58 +00:00

func_module.c

remove some useless includes

2007-11-22 02:30:58 +00:00

func_odbc.c

AST-2009-005

2009-08-10 19:25:03 +00:00

func_rand.c

AST-2009-005

2009-08-10 19:25:03 +00:00

func_realtime.c

Merged revisions 206808 via svnmerge from

2009-07-16 16:52:52 +00:00

func_sha1.c

remove some useless includes

2007-11-22 02:30:58 +00:00

func_shell.c

another bunch of include removals (errno.h and asterisk/logger.h)

2007-11-19 19:09:03 +00:00

func_strings.c

Revert XML docs that ended up in the 1.6.0 and 1.6.1 branches during a merge.

2009-10-02 13:04:24 +00:00

func_sysinfo.c

Merged revisions 131484 via svnmerge from

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

func_timeout.c

I needed to increment the numbers used on the VERBOSITY_ATLEAST calls by 1.

2007-12-14 19:19:07 +00:00

func_uri.c

another bunch of include removals (errno.h and asterisk/logger.h)

2007-11-19 19:09:03 +00:00

func_version.c

Simplify a trivial snprintf() with ast_copy_string()

2008-03-04 04:57:29 +00:00

func_vmcount.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

func_volume.c

remove some unnecessary includes.

2007-11-19 20:42:06 +00:00

Makefile

Merged revisions 207680 via svnmerge from

2009-07-21 13:39:44 +00:00