diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2014-07-04 12:54:38 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@xamarin.com> | 2014-07-04 12:54:38 +0400 |
| commit | 22712fa29a0927a5341cd1920fdd8096107b678d (patch) | |
| tree | a9c9ce0f91c8e62cc6988b6a90f90b2a45937c50 /main/tests/UnitTests/MonoDevelop.CSharpBinding | |
| parent | 433edd6f1d7980a0af39d502c253821b447054db (diff) | |
| parent | 3dbcdf64de0826aa76b5f108ae80644511b4e587 (diff) | |
Merge remote-tracking branch 'origin/monodevelop-5.2-branch' into retina-SideBySide
Conflicts:
main/src/addins/MacPlatform/MacMenu/MDMenuItem.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
Diffstat (limited to 'main/tests/UnitTests/MonoDevelop.CSharpBinding')
| -rw-r--r-- | main/tests/UnitTests/MonoDevelop.CSharpBinding/TestDocument.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/main/tests/UnitTests/MonoDevelop.CSharpBinding/TestDocument.cs b/main/tests/UnitTests/MonoDevelop.CSharpBinding/TestDocument.cs index b0ae822576..8803593ed1 100644 --- a/main/tests/UnitTests/MonoDevelop.CSharpBinding/TestDocument.cs +++ b/main/tests/UnitTests/MonoDevelop.CSharpBinding/TestDocument.cs @@ -31,7 +31,8 @@ namespace MonoDevelop.CSharpBinding { public class TestDocument : MonoDevelop.Ide.Gui.Document { - internal ParsedDocument HiddenParsedDocument; + public ParsedDocument HiddenParsedDocument; + public override ParsedDocument ParsedDocument { get { return HiddenParsedDocument; @@ -42,7 +43,7 @@ namespace MonoDevelop.CSharpBinding { } - internal IProjectContent HiddenProjectContent; + public IProjectContent HiddenProjectContent; public override IProjectContent GetProjectContext () { |