Merge branch 'master' into ti

This commit is contained in:
toddouska 2014-05-15 10:41:16 -07:00
commit fd84098db4

View File

@ -1683,7 +1683,7 @@ echo "Generating user options header..."
OPTION_FILE="cyassl/options.h"
rm -f $OPTION_FILE
echo "/* cyassl options.h" >> $OPTION_FILE
echo "/* cyassl options.h" > $OPTION_FILE
echo " * generated from configure options" >> $OPTION_FILE
echo " *" >> $OPTION_FILE
echo " * Copyright (C) 2006-2014 wolfSSL Inc." >> $OPTION_FILE