#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.
Siegfried Pammer
2dc8a6dc1a
Merge branch 'master' of github.com:icsharpcode/SharpDevelop into newNR
Conflicts:
src/AddIns/Analysis/MachineSpecifications/MachineSpecifications.Tests/Properties/AssemblyInfo.cs
src/AddIns/Analysis/MachineSpecifications/MachineSpecifications.Tests/Src/ClassFilterBuilder.cs
src/AddIns/Analysis/MachineSpecifications/MachineSpecifications.Tests/Src/MSpecTestFrameworkTests.cs
src/AddIns/Analysis/UnitTesting/Src/InnerClassEnumerator.cs
src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildOptions.xaml.cs
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfToolbox.cs
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfViewContent.cs
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/WpfDesign.AddIn.csproj
src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj
src/Libraries/NRefactory/Project/Src/PrettyPrinter/CSharp/CSharpOutputVisitor.cs
src/Libraries/NRefactory/Test/Output/CSharp/VBNetToCSharpConverterTest.cs
src/Main/Base/Project/Src/Gui/Dialogs/GotoDialog.cs
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/BuildAdvanced.xaml.cs
src/Main/Base/Project/Src/Project/Behaviors/DotNetStartBehavior.cs
src/Main/Base/Project/Src/Util/ExtensionMethods.cs
src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj
src/Main/GlobalAssemblyInfo.template
|
12 years ago |
| .. |
|
Project
|
Merge branch 'master' of github.com:icsharpcode/SharpDevelop into newNR
|
12 years ago |
|
Tests
|
Merge branch 'master' of github.com:icsharpcode/SharpDevelop into newNR
|
12 years ago |
