Conflicts: src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditorView.cs src/AddIns/Misc/HelpViewer/Source/Commands.cs src/Main/GlobalAssemblyInfo.cs.template src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/XmlDoc.cs src/Setup/Files.wxs src/Setup/Setup.wxs src/Tools/NUnit/nunit-console-dotnet2-x86.exe src/Tools/NUnit/nunit-console-dotnet2.exe src/Tools/NUnit/nunit-console-x86.exe src/Tools/NUnit/nunit-console.exe