From: Martin Holst Swende <martin@swende.se>
Date: Wed, 17 Feb 2016 15:15:39 +0000 (+0100)
Subject: Merge pull request #165 from wllm-rbnt/master
X-Git-Tag: v2.3.0~5
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/12bad10c465c0ec2a7c0cf620ffef281ba095864?hp=b12f076b0d6cdd0411d6bfdec3e8fbd3d1134321

Merge pull request #165 from wllm-rbnt/master

Typos
---

diff --git a/client/lualibs/mf_default_keys.lua b/client/lualibs/mf_default_keys.lua
index 804d4a84..4dee8b4d 100644
--- a/client/lualibs/mf_default_keys.lua
+++ b/client/lualibs/mf_default_keys.lua
@@ -106,7 +106,7 @@ local _keys = {
     '776974687573', -- RKF ÖstgötaTrafiken Key B
 
     --[[
-    The keys below are taken from from https://code.google.com/p/mifare-key-cracker/downloads/list
+    The keys below are taken from https://code.google.com/p/mifare-key-cracker/downloads/list
     --]]
 
     'bd493a3962b6',
@@ -129,7 +129,7 @@ local _keys = {
     '123456789abc',
 	
 	--[[
-    The keys below are taken from from https://github.com/4ZM/mfterm/blob/master/dictionary.txt
+    The keys below are taken from https://github.com/4ZM/mfterm/blob/master/dictionary.txt
     --]]
 	
 	'abcdef123456', -- Key from ladyada.net
@@ -199,7 +199,7 @@ local function uniq(list)
             table.insert(foobar, value);
         end
     end
-    --print("final list length length ", #foobar)
+    --print("final list length ", #foobar)
     return foobar
 end
 
diff --git a/common/default_version.c b/common/default_version.c
index 9f818bed..b564681c 100644
--- a/common/default_version.c
+++ b/common/default_version.c
@@ -2,7 +2,7 @@
 /* This is the default version.c file that Makefile.common falls back to if perl is not available */
 const struct version_information __attribute__((section(".version_information"))) version_information = { 
 		VERSION_INFORMATION_MAGIC, 
-		1, /* version version 1 */
+		1, /* version 1 */
 		0, /* version information not present */
 		2, /* cleanliness couldn't be determined */
 		/* Remaining fields: zero */
diff --git a/common/lfdemod.c b/common/lfdemod.c
index 982a724a..8eb1c19b 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -483,7 +483,7 @@ size_t fsk_wave_demod(uint8_t * dest, size_t size, uint8_t fchigh, uint8_t fclow
 
 	size_t numBits = 0;
 	// count cycles between consecutive lo-hi transitions, there should be either 8 (fc/8)
-	// or 10 (fc/10) cycles but in practice due to noise etc we may end up with with anywhere
+	// or 10 (fc/10) cycles but in practice due to noise etc we may end up with anywhere
 	// between 7 to 11 cycles so fuzz it by treat anything <9 as 8 and anything else as 10
 	for(idx = 161; idx < size-20; idx++) {
 		// threshold current value