[ros-diffs] Integrated change by chorns in revision 12444

Remove no-windres-workaround branch.
Deleted: branches/no-windres-workaround/