Merged revisions 336313 via svnmerge from
authorTerry Wilson <twilson@digium.com>
Fri, 16 Sep 2011 22:11:01 +0000 (22:11 +0000)
committerTerry Wilson <twilson@digium.com>
Fri, 16 Sep 2011 22:11:01 +0000 (22:11 +0000)
commit9223069c6ed076c3cccb3215e1568250df7f587f
tree9ae401cdc4973845e064a2f52b6ae77f3c952711
parentbeae2df26eaba06d91b99e1365596081bcd30ca0
Merged revisions 336313 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r336313 | twilson | 2011-09-16 17:07:00 -0500 (Fri, 16 Sep 2011) | 12 lines

  Merged revisions 336312 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r336312 | twilson | 2011-09-16 17:04:25 -0500 (Fri, 16 Sep 2011) | 5 lines

    Add missing frame types to func_frame_trace

    Also casts control frames to the proper enum so that the compile will catch
    new additions.
  ........
................

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