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

.gitignore

@@ -0,0 +1,18 @@
+
+/REVISION
+/bin/
+/build/
+/doc/ChangeLog.html
+/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/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/Tools/Tools.build

@@ -54,6 +54,7 @@
 	
 	<Target Name="PrepareRelease">
 		<!--<MSBuild Projects="@(PrepareReleaseProject)" Targets="Build"/>-->
+		<MSBuild Projects="UpdateAssemblyInfo\UpdateAssemblyInfo.csproj" Targets="Build" Properties="Configuration=Debug"/>
 		<Exec Command="UpdateAssemblyInfo.exe --REVISION" WorkingDirectory = "UpdateAssemblyInfo\bin\Debug" Timeout = "60000" IgnoreExitCode = "false"/>
 	</Target>