]> git.ipfire.org Git - thirdparty/asterisk.git/commit
projects / thirdparty / asterisk.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2ea15c9) | patch
Merged revisions 257810 via svnmerge from
authorTerry Wilson <twilson@digium.com>
Mon, 19 Apr 2010 18:22:24 +0000 (18:22 +0000)
committerTerry Wilson <twilson@digium.com>
Mon, 19 Apr 2010 18:22:24 +0000 (18:22 +0000)
commit1ad161041b5218a2156158bee50ff226010a48f3
tree307bfcebc60808b969ac30aa825acfeb3d9e72a2tree
parent2ea15c9ac634994fdaa7af90846f86e5a71e237ccommit | 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.1@257833 65c4cc65-6c06-0410-ace0-fbb531ad65f3
main/features.c diff | blob | blame | history
Mirror of https://github.com/asterisk/asterisk.git