]> git.ipfire.org Git - thirdparty/asterisk.git/commit
Merged revisions 231741 via svnmerge from
authorMatthew Nicholson <mnicholson@digium.com>
Tue, 1 Dec 2009 15:48:49 +0000 (15:48 +0000)
committerMatthew Nicholson <mnicholson@digium.com>
Tue, 1 Dec 2009 15:48:49 +0000 (15:48 +0000)
commit4d090bc94da1d69bad6c9831ad0f99e5db70c778
tree9a2c8b83a539d9a86b7bb301e201f5c22a0188b0
parent47deec6289becce368d632a695fe7d72f4b9112b
Merged revisions 231741 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r231741 | mnicholson | 2009-12-01 09:47:36 -0600 (Tue, 01 Dec 2009) | 9 lines

  Merged revisions 231740 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r231740 | mnicholson | 2009-12-01 09:34:57 -0600 (Tue, 01 Dec 2009) | 2 lines

    Ignore unknown formats in ast_format_str_reduce() and return an error if no know formats are found.
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@231742 65c4cc65-6c06-0410-ace0-fbb531ad65f3
main/file.c