#develop (short for SharpDevelop) is a free IDE for .NET programming languages.
You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Matt Ward
e3a387d4b4
Merge branch 'master' into newNR
Conflicts:
src/AddIns/BackendBindings/FSharpBinding/FSharpBinding.csproj
src/AddIns/BackendBindings/WixBinding/Project/Src/Project/WixProject.cs
src/AddIns/DisplayBindings/ILSpyAddIn/ViewContent/CodeView.cs
src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj
src/AddIns/Misc/PackageManagement/Project/Src/LicenseAcceptanceService.cs
src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementWorkbench.cs
src/AddIns/Misc/PackageManagement/Project/Src/SelectProjectsService.cs
src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestableProject.cs
src/AddIns/Misc/PackageManagement/Test/Src/Scripting/RunPackageScriptsActionTests.cs
src/AddIns/Misc/PackageManagement/Test/Src/SharpDevelopProjectSystemTests.cs
src/AddIns/Misc/SearchAndReplace/Project/SearchOptions.cs
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/SimpleSelection.cs
src/Main/GlobalAssemblyInfo.cs.template
src/Setup/Files.wxs
src/Setup/Setup.wxs
|
12 years ago |
| .. |
|
Project
|
Merge branch 'master' into newNR
|
12 years ago |
|
Test
|
Merge branch 'master' into newNR
|
12 years ago |
