Commit Graph

3 Commits

Author SHA1 Message Date
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
David Vossel
703dde7da8 Merged revisions 228268 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r228268 | dvossel | 2009-11-06 09:04:24 -0600 (Fri, 06 Nov 2009) | 9 lines
  
  fixes memory leak in func_audiohookinherit.c
  
  (closes issue #15394)
  Reported by: boroda
  Patches:
        bug15394_memoryleak_diff2.txt uploaded by dbrooks (license 790)
  Tested by: dbrooks, boroda
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@228271 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-11-06 15:06:19 +00:00
Mark Michelson
15ec36e3aa Adding missing file func_audiohookinherit.c
I don't know why this wasn't added to begin with. It's
here now though :)



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166160 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-19 23:41:09 +00:00