Merge branch 'master' of github.com:icsharpcode/SharpDevelop

.gitignore

@@ -1,18 +1,19 @@
-
+# ignore all obj and bin folders (even in subdirectories)
+obj/
+bin/
 /REVISION
-/bin/
 /build/
+/AddIns/
 /doc/ChangeLog.html
+/data/resources/StringResources.*.resources
 /src/AddIns/Analysis/Profiler/Controller/Data/UnmanagedCallTreeNode64.cs
 /src/AddIns/Analysis/Profiler/Controller/Profiler64.cs
 /src/AddIns/Analysis/Profiler/Controller/structs64.cs
 /src/AddIns/Analysis/Profiler/Hook/Callback.x64.obj
-/src/AddIns/Analysis/Profiler/bin/
-obj/
+/src/AddIns/Analysis/Profiler/Hook/x64
+/src/AddIns/Analysis/Profiler/Hook/Win32
 /src/Tools/UpdateAssemblyInfo/bin
-/src/AddIns/Misc/Profiler/X64Converter/bin
-/src/AddIns/Misc/Profiler/Hook/x64
-/src/AddIns/Misc/Profiler/Hook/Win32
 /src/Setup/SharpDevelop.Setup.wixproj.user
 /src/Main/ICSharpCode.SharpDevelop.Sda/ICSharpCode.SharpDevelop.Sda.dll.config
-/src/Main/StartUp/Project/SharpDevelop.exe.config
+/src/Main/StartUp/Project/SharpDevelop.exe.config
+/src/Main/GlobalAssemblyInfo.cs

src/Automated.proj

@@ -133,7 +133,7 @@
 
 	<Target Name="zipsource">
 		<CreateItem Include="$(ProjectDir)\**"
-		            Exclude="$(ProjectDir)\**\.svn\**;$(ProjectDir)\**\obj\**">
+		            Exclude="$(ProjectDir)\**\.svn\**;$(ProjectDir)\**\obj\**;$(ProjectDir)\.git\**;$(ProjectDir)\.git*;$(ProjectDir)\build\**">
 			<Output TaskParameter="Include" ItemName="FileToZip"/>
 		</CreateItem>
 		<Message Importance="high" Text="Creating ZIP file $(ArtefactPrefix)$(BuildNumber)_Source.zip"/>

src/Tools/UpdateAssemblyInfo/Main.cs

@@ -193,6 +193,9 @@ static void RetrieveRevisionNumber()
 		static void ReadRevisionNumberFromGit()
 		{
 			ProcessStartInfo info = new ProcessStartInfo("cmd", "/c git rev-list --first-parent " + BaseCommit + "..HEAD");
+			string path = Environment.GetEnvironmentVariable("PATH");
+			path += ";" + Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "git\\bin");
+			info.EnvironmentVariables["PATH"] =  path;
 			info.RedirectStandardOutput = true;
 			info.UseShellExecute = false;
 			using (Process p = Process.Start(info)) {