Fix build errors after merge.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@6320 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockViewContent.cs

@@ -225,5 +225,10 @@ namespace RubyBinding.Tests.Utils
 				throw new NotImplementedException();
 			}
 		}
+		
+		public object GetService(Type serviceType)
+		{
+			return null;
+		}
 	}
 }

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/MockViewContend.cs

@@ -225,5 +225,10 @@ namespace ICSharpCode.Reports.Addin.Test.Designer
 				throw new NotImplementedException();
 			}
 		}
+		
+		public object GetService(Type serviceType)
+		{
+			return null;
+		}
 	}
 }

src/Main/GlobalAssemblyInfo.template

@@ -34,5 +34,5 @@ internal static class RevisionClass
 	public const string MainVersion = Major + "." + Minor;
 	public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;
 	
-	public const string BranchName = "wpfdesigner";
+	public const string BranchName = null;
 }