Does that conclude the merge of the Windows port?
What remains to be merged?

David will need to confirm, but I believe the answer is no, this is just step 2 of about half a dozen or so which will be required to fully complete the merge. For example, for 1.1.3 David has slated improvements to the installer, among other things....

—♯ƒ • François-René ÐVB Rideau •Reflection&Cybernethics• http://fare.tunes.org
The liberties of the American people [are] dependent upon the ballot-box,
the jury-box, and the cartridge-box.
— Frederick Douglass