Skip to content

Commit

Permalink
Merge branch 'master' of github.com:project-everest/everest
Browse files Browse the repository at this point in the history
  • Loading branch information
msprotz committed Mar 29, 2017
2 parents 996150e + e8be584 commit c35fc48
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
4 changes: 3 additions & 1 deletion everest
Expand Up @@ -468,7 +468,9 @@ OCAML
fi

if ! command -v scons.bat >/dev/null 2>&1; then
red "ERROR: scons.bat not found -- install it? (y/n)"
red "ERROR: scons.bat was not found so scons will need to be installed."
red "NOTE: scons requires Python 2.7. Choose Python 2.7 in the second page of the scons install wizard."
red "Start the install wizard for scons (Y/n)?"
if prompt_yes true "exit 1"; then
wget $SCONS_INSTALL_POINT
chmod a+x scons-2.5.0-setup.exe
Expand Down
10 changes: 5 additions & 5 deletions hashes.sh
@@ -1,12 +1,12 @@
declare -A hashes
declare -A branches
hashes[vale]=ce9e51da688de2dd1f488c253dc69d13569ee398
hashes[vale]=9c1dc3be1105209c3e5f3ba4c386cde3ea02fe61
branches[vale]=master
hashes[mitls-fstar]=b19c1b2251ee14be74aa2d104eab20c7f14b9738
hashes[mitls-fstar]=621ec22e5e1407fde6a5ee9c908c718dba5a1233
branches[mitls-fstar]=master
hashes[FStar]=fdb8e7ef0a6e41afe5329332ca64415b5c9182b8
hashes[FStar]=d10417a765764102e38cb80d411e9673981d1b82
branches[FStar]=master
hashes[hacl-star]=aa571cf8b1acea84a4db05d6bc0996c4745f3b06
hashes[hacl-star]=046b5daeebab1ffee20d759c01095addf33718c6
branches[hacl-star]=master
hashes[kremlin]=f89ac478eb711c888fa9849a2ec0a138410d4d4b
hashes[kremlin]=74f6c4b4dc2658ab1478e6da205cb44a554bea37
branches[kremlin]=master

0 comments on commit c35fc48

Please sign in to comment.