Kinsey Moore 6851801a5e Resolve a merge conflict ...

When ast_channel_cached_blob_create was merged,
ast_channel_blob_create_from_cache was partially removed in an
unresolved merge conflict. This restores ast_channel_blob_create_from_cache
and refactors usage of ast_channel_cached_blob_create (requires an
ast_channel) to use ast_channel_blob_create_from_cache (requires a
channel uniqueid) instead.


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

2013-05-29 02:26:17 +00:00

..

asterisk

Resolve a merge conflict

2013-05-29 02:26:17 +00:00

solaris-compat

…

asterisk.h

Fix build breakage, from LOW_MEMORY fix.

2013-05-07 17:53:50 +00:00

jitterbuf.h

incorporates r159808 from branches/1.4:

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