johndempster/WinFluor — pull request #15 by darrincedwards (2013-04-26 20:14:27+00:00)
Title: Fix error in baae2a, wrong version of MAIN.dfm

When I merged 3.4.6 into my master, I mistakenly kept
my version of MAIN.dfm instead of keeping the new (good)
version. (I keep forgetting that when git grumbles about
the file being binary, it is talking about the common
ancestor, not necessarily the file being merged.)