[Cryptech-Commits] [user/sra/alpha-releng/omnibus] 22/24: Merged software/master.

[git at cryptech.is]

This is an automated email from the git hooks/post-receive script.

sra at hactrn.net pushed a commit to branch master
in repository user/sra/alpha-releng/omnibus.

commit 5ce361bac89d49a368350e8c475b83e8e6cf0718
Merge: 89e2328 856cb22
Author: Rob Austein <sra at hactrn.net>
AuthorDate: Mon Jun 27 11:38:39 2016 -0400

    Merged software/master.

 software/.gitmodules                 |  9 +++++
 software/Makefile                    | 64 ++++++++++++++++++++++++++++++++++++
 software/README.md                   | 31 +++++++++++++++++
 software/reprepro-conf/distributions |  7 ++++
 software/reprepro-conf/options       |  4 +++
 software/source/Makefile             | 19 +++++++++++
 software/source/debian/compat        |  1 +
 software/source/debian/control       | 14 ++++++++
 software/source/debian/copyright     | 27 +++++++++++++++
 software/source/debian/rules         |  4 +++
 software/source/debian/source/format |  1 +
 software/source/sw/libhal            |  1 +
 software/source/sw/pkcs11            |  1 +
 software/source/sw/thirdparty/libtfm |  1 +
 14 files changed, 184 insertions(+)

diff --cc software/.gitmodules
index 0000000,a464eb3..a464eb3
mode 000000,100644..100644
--- a/software/.gitmodules
+++ b/software/.gitmodules
diff --cc software/Makefile
index 0000000,787fea4..787fea4
mode 000000,100644..100644
--- a/software/Makefile
+++ b/software/Makefile
diff --cc software/README.md
index 0000000,15c1006..15c1006
mode 000000,100644..100644
--- a/software/README.md
+++ b/software/README.md
diff --cc software/reprepro-conf/distributions
index 0000000,57c1afc..57c1afc
mode 000000,100644..100644
--- a/software/reprepro-conf/distributions
+++ b/software/reprepro-conf/distributions
diff --cc software/reprepro-conf/options
index 0000000,f5ad660..f5ad660
mode 000000,100644..100644
--- a/software/reprepro-conf/options
+++ b/software/reprepro-conf/options
diff --cc software/source/Makefile
index 0000000,e2fdb1b..e2fdb1b
mode 000000,100644..100644
--- a/software/source/Makefile
+++ b/software/source/Makefile
diff --cc software/source/debian/compat
index 0000000,ec63514..ec63514
mode 000000,100644..100644
--- a/software/source/debian/compat
+++ b/software/source/debian/compat
diff --cc software/source/debian/control
index 0000000,8ae25b9..8ae25b9
mode 000000,100644..100644
--- a/software/source/debian/control
+++ b/software/source/debian/control
diff --cc software/source/debian/copyright
index 0000000,ec25460..ec25460
mode 000000,100644..100644
--- a/software/source/debian/copyright
+++ b/software/source/debian/copyright
diff --cc software/source/debian/rules
index 0000000,2d33f6a..2d33f6a
mode 000000,100755..100755
--- a/software/source/debian/rules
+++ b/software/source/debian/rules
diff --cc software/source/debian/source/format
index 0000000,89ae9db..89ae9db
mode 000000,100644..100644
--- a/software/source/debian/source/format
+++ b/software/source/debian/source/format
diff --cc software/source/sw/libhal
index 0000000,709a71c..709a71c
mode 000000,160000..160000
--- a/software/source/sw/libhal
+++ b/software/source/sw/libhal
diff --cc software/source/sw/pkcs11
index 0000000,3118c13..3118c13
mode 000000,160000..160000
--- a/software/source/sw/pkcs11
+++ b/software/source/sw/pkcs11
diff --cc software/source/sw/thirdparty/libtfm
index 0000000,269fc4e..269fc4e
mode 000000,160000..160000
--- a/software/source/sw/thirdparty/libtfm
+++ b/software/source/sw/thirdparty/libtfm