]> git.ipfire.org Git - thirdparty/asterisk.git/commit
projects / thirdparty / asterisk.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bf34fe7) | patch
Merged revisions 257810 via svnmerge from
authorTerry Wilson <twilson@digium.com>
Mon, 19 Apr 2010 18:06:28 +0000 (18:06 +0000)
committerTerry Wilson <twilson@digium.com>
Mon, 19 Apr 2010 18:06:28 +0000 (18:06 +0000)
commitced045b8e5e34ef3c61964fff6dc54e593b325df
treebf88b0f5dd73162ceb7778e6b31d4374f7ec193btree
parentbf34fe7dbbe07467c4db6ba598121a8b000225f9commit | diff
Merged revisions 257810 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r257810 | twilson | 2010-04-19 12:57:41 -0500 (Mon, 19 Apr 2010) | 5 lines

  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/branches/1.6.0@257811 65c4cc65-6c06-0410-ace0-fbb531ad65f3
main/features.c diff | blob | blame | history
Mirror of https://github.com/asterisk/asterisk.git