Added status to conflict(8) man page to note that it is deprecated.
[mmh] / sbr / dtimep.l
2012-01-20 Ken HornsteinConvert the build system over to the use of Automake.