From: Martin Holst Swende <martin@swende.se>
Date: Sun, 14 Dec 2014 17:07:38 +0000 (+0100)
Subject: Merge branch 'master' of github.com:Proxmark/proxmark3
X-Git-Tag: v2.0.0-rc1~84^2~1
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/b16043234058bd61d5b87952ab616105a1df21f6?hp=eabba3df7e2a09f466e6f5f988d973aff7722cd5

Merge branch 'master' of github.com:Proxmark/proxmark3
---

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 22aa1e05..cf920b1e 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -269,7 +269,7 @@ int CmdIndalaDemod(const char *Cmd)
     PrintAndLog("UID=%s (%x%08x%08x%08x%08x%08x%08x)", showbits, uid1, uid2, uid3, uid4, uid5, uid6, uid7);
   }
 
-  // Checking UID against next occurences
+  // Checking UID against next occurrences
   for (; i + uidlen <= rawbit;) {
     int failed = 0;
     for (bit = 0; bit < uidlen; bit++) {
@@ -283,7 +283,7 @@ int CmdIndalaDemod(const char *Cmd)
     }
     times += 1;
   }
-  PrintAndLog("Occurences: %d (expected %d)", times, (rawbit - start) / uidlen);
+  PrintAndLog("Occurrences: %d (expected %d)", times, (rawbit - start) / uidlen);
 
   // Remodulating for tag cloning
   GraphTraceLen = 32*uidlen;