[asterisk-commits] mmichelson: branch 1.6.0 r186843 - in /branches/1.6.0: ./ formats/

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Apr  7 19:09:54 2009
New Revision: 186843

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=186843
Log:
Merged revisions 186842 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r186842 | mmichelson | 2009-04-07 19:09:28 -0500 (Tue, 07 Apr 2009) | 14 lines
  
  Merged revisions 186841 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r186841 | mmichelson | 2009-04-07 19:09:04 -0500 (Tue, 07 Apr 2009) | 8 lines
    
    Fix a few typos of the word "frequency."
    
    (closes issue #14842)
    Reported by: jvandal
    Patches:
          frequency-typo.diff uploaded by jvandal (license 413)
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/formats/format_wav.c
    branches/1.6.0/formats/format_wav_gsm.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/formats/format_wav.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/formats/format_wav.c?view=diff&rev=186843&r1=186842&r2=186843
==============================================================================
--- branches/1.6.0/formats/format_wav.c (original)
+++ branches/1.6.0/formats/format_wav.c Tue Apr  7 19:09:54 2009
@@ -136,7 +136,7 @@
 		return -1;
 	}
 	if (ltohl(freq) != DEFAULT_SAMPLE_RATE) {
-		ast_log(LOG_WARNING, "Unexpected freqency %d\n", ltohl(freq));
+		ast_log(LOG_WARNING, "Unexpected frequency %d\n", ltohl(freq));
 		return -1;
 	}
 	/* Ignore the byte frequency */

Modified: branches/1.6.0/formats/format_wav_gsm.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/formats/format_wav_gsm.c?view=diff&rev=186843&r1=186842&r2=186843
==============================================================================
--- branches/1.6.0/formats/format_wav_gsm.c (original)
+++ branches/1.6.0/formats/format_wav_gsm.c Tue Apr  7 19:09:54 2009
@@ -150,7 +150,7 @@
 		return -1;
 	}
 	if (ltohl(freq) != DEFAULT_SAMPLE_RATE) {
-		ast_log(LOG_WARNING, "Unexpected freqency %d\n", ltohl(freq));
+		ast_log(LOG_WARNING, "Unexpected frequency %d\n", ltohl(freq));
 		return -1;
 	}
 	/* Ignore the byte frequency */