Fix incomplete CDR merge from r195881
authorTerry Wilson <twilson@digium.com>
Mon, 19 Apr 2010 17:57:41 +0000 (17:57 +0000)
committerTerry Wilson <twilson@digium.com>
Mon, 19 Apr 2010 17:57:41 +0000 (17:57 +0000)
commit9674766487e729f2cd46fa7ed4ac68b45e5ad60d
tree20397b5f955145d62e49c27dfe4278917f85f992
parent3bb60ae5b7056fa9bbb4fa68916c94a84b4908b4
Fix incomplete CDR merge from r195881

Because res/res_features.c was removed and main/cdr.c added, these changes
didn't make it to trunk and the 1.6.x branches

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