aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFredrik Thulin <fredrik@thulin.net>2016-06-17 20:41:43 +0200
committerFredrik Thulin <fredrik@thulin.net>2016-06-17 20:41:43 +0200
commit1fe7d1bf9d6c7ffb1da530e69cf77c8416068e3b (patch)
treeb574f84b53ab8d8eb096e606ba2214f7c73365ea
parent04f8680dddcce7d9f243279b21e4260dbfd1077b (diff)
libhal branch ft-ks_flash is merged to master
-rw-r--r--.gitmodules1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 898dc58..d3946e7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,6 @@
[submodule "libhal"]
path = libraries/libhal
url = git@git.cryptech.is:sw/libhal.git
- branch = ft-ks_flash
[submodule "thirdparty/libtfm"]
path = libraries/thirdparty/libtfm
url = git@git.cryptech.is:sw/thirdparty/libtfm.git