chiark / gitweb /
Merge remote-tracking branch 'sgt/master'
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 8 Mar 2014 22:11:59 +0000 (22:11 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 8 Mar 2014 22:11:59 +0000 (22:11 +0000)
commit8e7519302ad8da8ecb172cd863e8835abfa7b9e1
treebb667206a25ac41aa3f03c0dede8d413b8777c07
parent7c6fcb4307273d71a0f7a5f9cb0e8b7e9d3e26b2
parentea5f3526c7c05c153a9c7c49e91c9ac649560fba
Merge remote-tracking branch 'sgt/master'

Changes made to the new code in sgt/master:
  - use "-std=gnu99" not "--std=gnu99"
  - n_over_best calculation is in set_best
  - n_over_best initialised properly
 style:
  - use calloc, do not cast return value from int, better sizeof
  - extra blank line

Conflicts:
Makefile
main.c
main.c