diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2012-06-04 12:06:20 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2012-06-04 12:06:20 +0400 |
| commit | 0bbe4f1172cd597343a7a490b8c71c7774091a53 (patch) | |
| tree | 6ed868b3bdb27a36cc8c1fe80aef57fdc3843206 /main/src/core/MonoDevelop.Ide/Makefile.am | |
| parent | 365707cb2069da07dc03bb9b94e3a36463692e7a (diff) | |
| parent | dac62a1f64625de713bb4533fb6e6de8d4df4e76 (diff) | |
Merge branch 'master' into ui-refresh
Conflicts:
main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/Makefile.am')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/main/src/core/MonoDevelop.Ide/Makefile.am b/main/src/core/MonoDevelop.Ide/Makefile.am index 113700da98..b46b5ad02b 100644 --- a/main/src/core/MonoDevelop.Ide/Makefile.am +++ b/main/src/core/MonoDevelop.Ide/Makefile.am @@ -536,7 +536,6 @@ FILES = \ MonoDevelop.Ide.Gui.Pads.ProjectPad/WorkspaceNodeBuilder.cs \ MonoDevelop.Ide.Gui.Pads/DefaultMonitorPad.cs \ MonoDevelop.Ide.Gui.Pads/ErrorListPad.cs \ - MonoDevelop.Ide.Gui.Pads/InternalLogPad.cs \ MonoDevelop.Ide.Gui.Pads/MonodocTreePad.cs \ MonoDevelop.Ide.Gui.Pads/SolutionPad.cs \ MonoDevelop.Ide.Gui.Pads/TaskListPad.cs \ |