[Monodevelop-patches-list] r1304 - in trunk/MonoDevelop/src: AddIns/BackendBindings/CSharpBinding Main/Base Main/Base/Gui/Pads/ProjectBrowser

[commit-watcher at mono-cvs.ximian.com]

Author: tberman
Date: 2004-03-31 04:36:43 -0500 (Wed, 31 Mar 2004)
New Revision: 1304

Modified:
   trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/ChangeLog
   trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Makefile.am
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs
Log:
fix nick's bug (i hope) and vlad's bug from bugzilla


Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/ChangeLog	2004-03-31 05:39:28 UTC (rev 1303)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/ChangeLog	2004-03-31 09:36:43 UTC (rev 1304)
@@ -1,3 +1,7 @@
+2004-03-31  Todd Berman <tberman at sevenl.net>
+
+	* Makefile.am: i think this fixed nick's bug.
+
 2004-03-28  John Luke  <jluke at cfl.rr.com>
 
 	* Parser/Resolver.cs: comment some CWL's that were causing exceptions

Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Makefile.am	2004-03-31 05:39:28 UTC (rev 1303)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Makefile.am	2004-03-31 09:36:43 UTC (rev 1304)
@@ -8,7 +8,8 @@
 	/r:../../../../build/bin/ICSharpCode.SharpRefactory.dll \
 	/r:../../../../build/bin/MonoDevelop.Gui.Widgets.dll  \
 	/r:gtk-sharp \
-	/r:glade-sharp
+	/r:glade-sharp \
+	$(GTKSOURCEVIEW_SHARP) 
 
 FILES = \
 ./Gui/ChooseRuntimePanel.cs \

Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-03-31 05:39:28 UTC (rev 1303)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-03-31 09:36:43 UTC (rev 1304)
@@ -1,3 +1,8 @@
+2004-03-31  Todd Berman  <tberman at sevenl.net>
+
+	* Gui/Pads/ProjectBrowser/ProjectBrowserView.cs: fix bug #56273, rename
+	Projects tab to Combine.
+
 2004-03-31  John Luke  <jluke at cfl.rr.com>
 
 	* Commands/ProjectBrowserCommands/FolderNodeCommands.cs:

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs	2004-03-31 05:39:28 UTC (rev 1303)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs	2004-03-31 09:36:43 UTC (rev 1304)
@@ -56,7 +56,7 @@
 		
 		public string Title {
 			get {
-				return resourceService.GetString("MainWindow.Windows.ProjectScoutLabel");
+				return "Combine";
 			}
 		}