Merge branch 'master' of https://github.com/opentrv/OTAESGCM.git

Conflicts: OTAESGCM.zip content/OTAESGCM/RELEASES_OTAESGCM.txt
opentrv · Feb 7, 2016 · 4129a14 · 4129a14
2 parents 8fc9b0e + 3feb6da
commit 4129a14
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 0 deletions.
diff --git a/OTAESGCM.zip b/OTAESGCM.zip
diff --git a/content/OTAESGCM/RELEASES_OTAESGCM.txt b/content/OTAESGCM/RELEASES_OTAESGCM.txt
@@ -16,6 +16,7 @@ pending:
     DHD20160207: allowing NULL ciphertext for zero-length in fixed32BTextSize12BNonce16BTagSimpleDec_DEFAULT_STATELESS().
 
 
+
 20150804:
     freezepoint name: V0.1
     branch name: HEAD