aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2017-05-09 23:09:22 -0400
committerRob Austein <sra@hactrn.net>2017-05-09 23:09:22 -0400
commit2a07b3f3e2bcc585abe95568fa2eda933338fb08 (patch)
tree1539910432125ba3d277b2af178b15fcf573da9f
parentdaaaf688cee5692f68edebef8431e479f2ab29ed (diff)
Bump version number, pull in README updates.
-rw-r--r--Makefile2
-rw-r--r--README.md2
m---------source/sw/libhal0
m---------source/sw/pkcs110
4 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 67aa51b..1eb9b50 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
# What we call the package before we start mucking with branches and revision numbers
PACKAGE_BASE_NAME := cryptech-alpha
-PACKAGE_BASE_VERSION := 2.0
+PACKAGE_BASE_VERSION := 3.0
# Git voodoo: plumbing commands to pull the current branch and list of
# all (local) branches, and to pull something we can use as a version
diff --git a/README.md b/README.md
index a099e13..42f3b76 100644
--- a/README.md
+++ b/README.md
@@ -132,7 +132,7 @@ have not put any serious thought into build issues for Windows.
[XiLinxTools]: http://www.xilinx.com/support/download/index.html/content/xilinx/en/downloadNav/design-tools.html
-[osxcross]: https://github.com/tpoechtrager/osxcross
[pbuilder]: https://pbuilder.alioth.debian.org/
[Homebrew]: http://brew.sh/
+[osxcross]: https://github.com/tpoechtrager/osxcross
[MinGW]: http://www.mingw.org/
diff --git a/source/sw/libhal b/source/sw/libhal
-Subproject 08b3af196bc941c9f43156b414ea94faacf6472
+Subproject a49b53463451d9f78b5e7fc6331fcad6faf754f
diff --git a/source/sw/pkcs11 b/source/sw/pkcs11
-Subproject 89f03d199f820f3de967ee2a72b7d9a4cf21ea7
+Subproject 743ec40231db809d22487ee60f64d00b7b84580