Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit 369cec8

Browse files
author
gumme
committed
Merge remote-tracking branch 'upstream/master'
Conflicts: src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlDocument.cs src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlTypeFinder.cs
2 parents f782cb2 + f2265bd commit 369cec8

6,948 files changed

Lines changed: 140180 additions & 51907 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.tgitconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[tgit]
2+
icon = src/Main/SharpDevelop/Resources/SharpDevelop.ico

‎README.txt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ Website: http://www.icsharpcode.net/OpenSource/SD/Default.aspx
33
Forums: http://community.sharpdevelop.net/forums/
44
Nightly builds: http://build.sharpdevelop.net/BuildArtefacts
55

6-
Copyright 2012 AlphaSierraPapa for the SharpDevelop team
7-
License: SharpDevelop is distributed under the LGPL.
6+
Copyright 2014 AlphaSierraPapa for the SharpDevelop team.
7+
SharpDevelop is distributed under the MIT license.
88

99
The #develop project started on September 11th, 2000. The project was initiated
1010
by Mike Kr�ger. In the course of the project, several contributors joined in.
11-
If you want to contribute see http://wiki.sharpdevelop.net/JoiningTheTeam.ashx.
11+
If you want to contribute see <https://github.com/icsharpcode/SharpDevelop/wiki/Joining-the-Team>.
1212

1313
Overview
1414
#develop (short for SharpDevelop) is a free Integrated Development Environment
@@ -33,26 +33,25 @@ Extended Requirements (building SharpDevelop)
3333
- if you have cloned the SD git repository: git must be available on your PATH
3434

3535
Libraries and integrated tools:
36-
AvalonDock: New BSD License (BSD) (thanks to Adolfo Marinucci)
36+
AvalonDock: New BSD License (BSD) (thanks to Adolfo Marinucci) - http://avalondock.codeplex.com/
3737
GraphSharp
3838
IQToolkit
3939
Irony
4040
ITextSharp
4141
log4net
4242
Mono T4
43-
Mono.Cecil: MIT License (thanks to Jb Evain)
43+
Mono.Cecil: MIT License (thanks to Jb Evain) - https://github.com/jbevain/cecil
4444
SharpSvn
4545
SQLite
4646
WPFToolkit
4747

4848
Integrated Tools (shipping with SharpDevelop):
49-
Boo
5049
IronPython
5150
IronRuby
5251
NuGet
5352
NUnit
54-
PartCover
55-
Wix
53+
OpenCover - https://github.com/OpenCover/opencover
54+
WiX
5655

5756
Reusable Libraries (developed as part of SharpDevelop):
5857
AvalonEdit
@@ -66,9 +65,10 @@ Reusable Libraries (developed as part of SharpDevelop):
6665
SharpDevelop Contributors:
6766
Mike Kr�ger (Project Founder)
6867
Daniel Grunwald (Technical Lead)
68+
Andreas Weizel
6969
Matt Ward
7070
David Srbecky (Debugger)
7171
Siegfried Pammer
72-
Peter Forstmeier (SharpDevelop Reports)
72+
Peter Forstmeier (SharpDevelop Reports)
7373

7474
(for a full list see https://github.com/icsharpcode/SharpDevelop/wiki/Contributors)

‎SharpDevelop.Tests.sln‎

Lines changed: 95 additions & 110 deletions
Large diffs are not rendered by default.

‎SharpDevelop.sln‎

Lines changed: 70 additions & 82 deletions
Large diffs are not rendered by default.

‎TODOnewNR.txt‎

Lines changed: 0 additions & 212 deletions
This file was deleted.

‎buildsamples.bat‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎data/resources/StringResources.cz.resx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1652,12 +1652,12 @@ Chcete přidat nový soubor do projektu ${CurrentProjectName}?</value>
16521652
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
16531653
<value>Zobrazit značku EOL</value>
16541654
</data>
1655+
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
1656+
<value>Zvýraznit párovou závorku</value>
1657+
</data>
16551658
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
16561659
<value>Zvýrazňovat symboly</value>
16571660
</data>
1658-
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
1659-
<value>Zvýraznit párovou závorku</value>
1660-
</data>
16611661
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">
16621662
<value>Ukázat vodorovné měřítko</value>
16631663
</data>

‎data/resources/StringResources.de.resx‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2341,12 +2341,12 @@ Wollen Sie die neue Datei zum Projekt ${CurrentProjectName} hinzufügen?</value>
23412341
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
23422342
<value>Markierung an Zeilen&amp;ende anzeigen</value>
23432343
</data>
2344+
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
2345+
<value>&amp;Passende Klammer markieren</value>
2346+
</data>
23442347
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
23452348
<value>Symbole hervorheben</value>
23462349
</data>
2347-
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
2348-
<value>&amp;Passende Klammer markieren</value>
2349-
</data>
23502350
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">
23512351
<value>&amp;Horizontales Linial</value>
23522352
</data>
@@ -3314,6 +3314,9 @@ Bitte einen anderen Dateinamen wählen.</value>
33143314
<data name="ICSharpCode.CodeCoverage.Column" xml:space="preserve">
33153315
<value>Spalte</value>
33163316
</data>
3317+
<data name="ICSharpCode.CodeCoverage.Content" xml:space="preserve">
3318+
<value>Inhalt</value>
3319+
</data>
33173320
<data name="ICSharpCode.CodeCoverage.DisplayOptions" xml:space="preserve">
33183321
<value>Anzeige-Optionen</value>
33193322
</data>

‎data/resources/StringResources.es-mx.resx‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2349,12 +2349,12 @@ Ejemplo: "120", "MainClass", "Main.cs, 120".</value>
23492349
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
23502350
<value>Mostrar marcas de &amp;párrafo</value>
23512351
</data>
2352+
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
2353+
<value>Resaltar &amp;corchetes</value>
2354+
</data>
23522355
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
23532356
<value>Resaltar símbolos</value>
23542357
</data>
2355-
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
2356-
<value>Resaltar &amp;corchetes</value>
2357-
</data>
23582358
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">
23592359
<value>Mostrar regla &amp;horizontal</value>
23602360
</data>
@@ -5041,6 +5041,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
50415041
<data name="MainWindow.Windows.CompilerMessageView.ToggleWordWrapButton.ToolTip" xml:space="preserve">
50425042
<value>Alternar Ajuste de Línea</value>
50435043
</data>
5044+
<data name="MainWindow.Windows.Debug.AddWatchExpression" xml:space="preserve">
5045+
<value>Agregar inspección</value>
5046+
</data>
50445047
<data name="MainWindow.Windows.Debug.Breakpoints" xml:space="preserve">
50455048
<value>Puntos de interrupción</value>
50465049
</data>

‎data/resources/StringResources.es.resx‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2346,12 +2346,12 @@ Para crear/manipular un objeto ActiveX/COM, arrastre una clase de un Control/Bib
23462346
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox" xml:space="preserve">
23472347
<value>Mostrar marcas de &amp;párrafo</value>
23482348
</data>
2349+
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
2350+
<value>Resaltar &amp;corchetes</value>
2351+
</data>
23492352
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
23502353
<value>Resaltar símbolos</value>
23512354
</data>
2352-
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve">
2353-
<value>Resaltar &amp;corchetes</value>
2354-
</data>
23552355
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">
23562356
<value>Mostrar regla &amp;horizontal</value>
23572357
</data>
@@ -5047,6 +5047,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
50475047
<data name="MainWindow.Windows.CompilerMessageView.ToggleWordWrapButton.ToolTip" xml:space="preserve">
50485048
<value>Alterna el Ajuste de Línea</value>
50495049
</data>
5050+
<data name="MainWindow.Windows.Debug.AddWatchExpression" xml:space="preserve">
5051+
<value>Agregar inspección</value>
5052+
</data>
50505053
<data name="MainWindow.Windows.Debug.Breakpoints" xml:space="preserve">
50515054
<value>Puntos de interrupción</value>
50525055
</data>

0 commit comments

Comments
 (0)