Merge branch 'master' into bishop_pin_clop
authorGary Linscott <glinscott@gmail.com>
Tue, 19 Feb 2013 15:31:52 +0000 (10:31 -0500)
committerGary Linscott <glinscott@gmail.com>
Tue, 19 Feb 2013 15:31:52 +0000 (10:31 -0500)
1  2 
src/evaluate.cpp

Simple merge