(svn r12353) [NewGRF_ports] -Fix: Overzealous merging! water_cmd.cpp only needed the extra clause for flood protection, not all the surrounding code.
Makefile*
bin/*
!bin/data/chars.grf
!bin/data/openttdd.grf
!bin/data/openttdw.grf
!bin/data/opntitle.grf
!bin/scenario/README
!bin/scripts*
config.*
objs/*
src/rev.cpp