ok I think I have it this time.
it's lots of fun doing this on my phone.
Remove bro-ids.
Merge remote-tracking branch 'upstream/master' into no-bro
Merge remote-tracking branch 'origin/master'
Merge branch 'no-bro'
Add an openntpd rule
 importing lua-5.2.3
Building on Unix
adding ossec-lua to be installed
Merge remote-tracking branch 'upstream/master'
merging
adding some standard modules
ossec-lua building on windows
Merge pull request #120 from jrossi/lua-scripts

ossec-lua lua interpreter
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/ddpbsd/ossec-hids
Merge pull request #144 from ddpbsd/master

Continue removing the bro-ids stuff
Fix make.sh files for win32

Added the shebang. Also used 'set -e' to exit the scripts upon
getting an error from any of the command being run. That is it say
if there is an issue compiling anything for any reason stop there
and continue not further.

Previously, it would just continue on until something would look
for the executables that weren't there and exit. Usually after makensis.

This makes it a lot clearer on where things went wrong and you don't have
to trudge through a lot of output to find compile issues.
Merge pull request #145 from awiddersheim/fix_win32_make_scripts

Fix make.sh files for win32 to exit the script upon getting an error.
Merge remote-tracking branch 'upstream/master' into emailheaders