This repository was archived by the owner on Oct 16, 2020. It is now read-only.
Commit 74994bc
committed
Merge branch 'reports' of github.com:icsharpcode/SharpDevelop into reports
Conflicts:
src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/Commands/ViewCommands.cs
src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/DesignerBinding/DesignerBinding.cs
src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/ICSharpCode.Reporting.Addin.csproj
src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/scr/Commands/ViewCommands.cs
src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/scr/DesignerBinding/DesignerBinding.cs
src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Commands/ViewCommands.cs
src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/DesignerBinding.cs
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/ICSharpCode.Reporting.csproj2 files changed
Lines changed: 0 additions & 2400 deletions
0 commit comments