Merged revisions 71063 via svnmerge from
authorSteve Murphy <murf@digium.com>
Fri, 22 Jun 2007 15:15:35 +0000 (15:15 +0000)
committerSteve Murphy <murf@digium.com>
Fri, 22 Jun 2007 15:15:35 +0000 (15:15 +0000)
commit6a2af3c983c9f7f8aa251c9ff6d5fe39faa43e8b
treeddd9eecf189aee9b4a098ee86568ff1d9bfacad2
parent68ac7f76332fd8ca371c4047a60e87073f8ef50a
Merged revisions 71063 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r71063 | murf | 2007-06-22 08:10:24 -0600 (Fri, 22 Jun 2007) | 1 line

My conditions for merging amaflags info was naive; DOCUMENTATION is the default, although null is possible; theft of user-settable fields is not good. Just copy them, leave them alone.
This is for bug 10016. (plus a small fix to rtp, to elim a compiler warning (dev mode))
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71093 65c4cc65-6c06-0410-ace0-fbb531ad65f3
main/cdr.c
main/rtp.c