Cleaned up root directory of project

nick-bulleid · Jun 10, 2010 · 369affa · 369affa
1 parent d4d4722
commit 369affa
Show file tree

Hide file tree

Showing 82 changed files with 26 additions and 43 deletions.
diff --git a/GitCommands/GitCommands.sln → GitCommands.sln b/GitCommands/GitCommands.sln → GitCommands.sln
@@ -3,31 +3,31 @@ Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitExtensions", "GitExtensions\GitExtensions.csproj", "{F15A69AF-7EBD-4F69-A026-5071FA3EC61B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimpleExt", "..\SimpleExt\SimpleExt.vcproj", "{BBE7B8AD-D175-4679-A614-38BFF28B0269}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimpleExt", "SimpleExt\SimpleExt.vcproj", "{BBE7B8AD-D175-4679-A614-38BFF28B0269}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitPlugin", "..\GitPlugin\GitPlugin.csproj", "{E996BE2D-B07D-472D-9D74-3EA2D48EF269}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitPlugin", "GitPlugin\GitPlugin.csproj", "{E996BE2D-B07D-472D-9D74-3EA2D48EF269}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitUI", "..\GitUI\GitUI.csproj", "{CF5B22E7-230F-4E50-BE88-C4F7023CED2C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitUI", "GitUI\GitUI.csproj", "{CF5B22E7-230F-4E50-BE88-C4F7023CED2C}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitCommands", "GitCommands\GitCommands.csproj", "{BD6AA2A2-997D-4AFF-ACC7-B64F6E51D181}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{3D5CA0E0-EF51-4488-A8B7-86CC330D7AD8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoCompileSubmodules", "..\Plugins\AutoCompileSubmodules\AutoCompileSubmodules\AutoCompileSubmodules.csproj", "{7E5433F4-DD13-4D8E-95B2-59B4FFE7D636}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoCompileSubmodules", "Plugins\AutoCompileSubmodules\AutoCompileSubmodules\AutoCompileSubmodules.csproj", "{7E5433F4-DD13-4D8E-95B2-59B4FFE7D636}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitUIPluginInterfaces", "..\Plugins\GitUIPluginInterfaces\GitUIPluginInterfaces.csproj", "{27559302-F35E-4B62-A6EC-11FF21A5FA6F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitUIPluginInterfaces", "Plugins\GitUIPluginInterfaces\GitUIPluginInterfaces.csproj", "{27559302-F35E-4B62-A6EC-11FF21A5FA6F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoCheckForUpdates", "..\Plugins\AutoCheckForUpdates\AutoCheckForUpdates.csproj", "{330F1115-B3DE-47F1-8A7E-D181E59E96E0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoCheckForUpdates", "Plugins\AutoCheckForUpdates\AutoCheckForUpdates.csproj", "{330F1115-B3DE-47F1-8A7E-D181E59E96E0}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Statistics", "Statistics", "{AF6D7B1B-FAF6-4793-AC05-00C63A5BC0F5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitStatistics", "..\Plugins\Statistics\GitStatistics\GitStatistics.csproj", "{92B57383-233E-46AE-8A86-6E98BF349A72}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitStatistics", "Plugins\Statistics\GitStatistics\GitStatistics.csproj", "{92B57383-233E-46AE-8A86-6E98BF349A72}"
 EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Setup", "..\Setup\Setup.wixproj", "{9380C29C-3C7F-47A8-A4C9-A5EE9D7B386A}"
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Setup", "Setup\Setup.wixproj", "{9380C29C-3C7F-47A8-A4C9-A5EE9D7B386A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceManager", "ResourceManager\ResourceManager.csproj", "{D3440FD7-AFC5-4351-8741-6CDBF15CE944}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gource", "..\Plugins\Gource\Gource.csproj", "{687A73BB-12A0-4AF7-B420-4A9C47DB75CB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gource", "Plugins\Gource\Gource.csproj", "{687A73BB-12A0-4AF7-B420-4A9C47DB75CB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/GitCommands/GitCommands.vsmdi → GitCommands.vsmdi b/GitCommands/GitCommands.vsmdi → GitCommands.vsmdi
diff --git a/GitCommands/GitCommands/ChangedFile.cs → GitCommands/ChangedFile.cs b/GitCommands/GitCommands/ChangedFile.cs → GitCommands/ChangedFile.cs
diff --git a/...ommands/GitCommands/ChangedFileManager.cs → GitCommands/ChangedFileManager.cs b/...ommands/GitCommands/ChangedFileManager.cs → GitCommands/ChangedFileManager.cs
diff --git a/GitCommands/GitCommands/Checkout.cs → GitCommands/Checkout.cs b/GitCommands/GitCommands/Checkout.cs → GitCommands/Checkout.cs
diff --git a/GitCommands/GitCommands/Clone.cs → GitCommands/Clone.cs b/GitCommands/GitCommands/Clone.cs → GitCommands/Clone.cs
diff --git a/GitCommands/GitCommands/CommandLogger.cs → GitCommands/CommandLogger.cs b/GitCommands/GitCommands/CommandLogger.cs → GitCommands/CommandLogger.cs
diff --git a/GitCommands/GitCommands/Commit.cs → GitCommands/Commit.cs b/GitCommands/GitCommands/Commit.cs → GitCommands/Commit.cs
diff --git a/GitCommands/GitCommands/ConfigFile.cs → GitCommands/ConfigFile.cs b/GitCommands/GitCommands/ConfigFile.cs → GitCommands/ConfigFile.cs
diff --git a/GitCommands/GitCommands/Diff.cs → GitCommands/Diff.cs b/GitCommands/GitCommands/Diff.cs → GitCommands/Diff.cs
diff --git a/GitCommands/GitCommands/Git/GitBlame.cs → GitCommands/Git/GitBlame.cs b/GitCommands/GitCommands/Git/GitBlame.cs → GitCommands/Git/GitBlame.cs
diff --git a/GitCommands/GitCommands/Git/GitCommands.cs → GitCommands/Git/GitCommands.cs b/GitCommands/GitCommands/Git/GitCommands.cs → GitCommands/Git/GitCommands.cs
diff --git a/GitCommands/GitCommands/Git/GitHead.cs → GitCommands/Git/GitHead.cs b/GitCommands/GitCommands/Git/GitHead.cs → GitCommands/Git/GitHead.cs
diff --git a/GitCommands/GitCommands/Git/GitItem.cs → GitCommands/Git/GitItem.cs b/GitCommands/GitCommands/Git/GitItem.cs → GitCommands/Git/GitItem.cs
diff --git a/GitCommands/GitCommands/Git/GitItemStatus.cs → GitCommands/Git/GitItemStatus.cs b/GitCommands/GitCommands/Git/GitItemStatus.cs → GitCommands/Git/GitItemStatus.cs
diff --git a/GitCommands/GitCommands/Git/GitRevision.cs → GitCommands/Git/GitRevision.cs b/GitCommands/GitCommands/Git/GitRevision.cs → GitCommands/Git/GitRevision.cs
diff --git a/GitCommands/GitCommands/Git/GitStash.cs → GitCommands/Git/GitStash.cs b/GitCommands/GitCommands/Git/GitStash.cs → GitCommands/Git/GitStash.cs
diff --git a/GitCommands/GitCommands/Git/GitSubmodule.cs → GitCommands/Git/GitSubmodule.cs b/GitCommands/GitCommands/Git/GitSubmodule.cs → GitCommands/Git/GitSubmodule.cs
diff --git a/GitCommands/GitCommands/Git/GitVersion.cs → GitCommands/Git/GitVersion.cs b/GitCommands/GitCommands/Git/GitVersion.cs → GitCommands/Git/GitVersion.cs
diff --git a/GitCommands/GitCommands/Git/IGitItem.cs → GitCommands/Git/IGitItem.cs b/GitCommands/GitCommands/Git/IGitItem.cs → GitCommands/Git/IGitItem.cs
diff --git a/GitCommands/GitCommands/GitCommands.csproj → GitCommands/GitCommands.csproj b/GitCommands/GitCommands/GitCommands.csproj → GitCommands/GitCommands.csproj
@@ -80,7 +80,7 @@
     <None Include="gitcommandkey.snk.pfx" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Plugins\GitUIPluginInterfaces\GitUIPluginInterfaces.csproj">
+    <ProjectReference Include="..\Plugins\GitUIPluginInterfaces\GitUIPluginInterfaces.csproj">
       <Project>{27559302-F35E-4B62-A6EC-11FF21A5FA6F}</Project>
       <Name>GitUIPluginInterfaces</Name>
     </ProjectReference>

diff --git a/GitCommands/GitCommands/Init.cs → GitCommands/Init.cs b/GitCommands/GitCommands/Init.cs → GitCommands/Init.cs
diff --git a/...ds/GitCommands/Properties/AssemblyInfo.cs → GitCommands/Properties/AssemblyInfo.cs b/...ds/GitCommands/Properties/AssemblyInfo.cs → GitCommands/Properties/AssemblyInfo.cs
diff --git a/GitCommands/GitCommands/Pull.cs → GitCommands/Pull.cs b/GitCommands/GitCommands/Pull.cs → GitCommands/Pull.cs
diff --git a/GitCommands/GitCommands/Push.cs → GitCommands/Push.cs b/GitCommands/GitCommands/Push.cs → GitCommands/Push.cs
diff --git a/GitCommands/GitCommands/Repositories.cs → GitCommands/Repositories.cs b/GitCommands/GitCommands/Repositories.cs → GitCommands/Repositories.cs
diff --git a/GitCommands/GitCommands/Repository.cs → GitCommands/Repository.cs b/GitCommands/GitCommands/Repository.cs → GitCommands/Repository.cs
diff --git a/...ommands/GitCommands/RepositoryCategory.cs → GitCommands/RepositoryCategory.cs b/...ommands/GitCommands/RepositoryCategory.cs → GitCommands/RepositoryCategory.cs
diff --git a/GitCommands/GitCommands/RepositoryHistory.cs → GitCommands/RepositoryHistory.cs b/GitCommands/GitCommands/RepositoryHistory.cs → GitCommands/RepositoryHistory.cs
diff --git a/GitCommands/GitCommands/RevisionGraph.cs → GitCommands/RevisionGraph.cs b/GitCommands/GitCommands/RevisionGraph.cs → GitCommands/RevisionGraph.cs
diff --git a/GitCommands/GitCommands/Settings.cs → GitCommands/Settings.cs b/GitCommands/GitCommands/Settings.cs → GitCommands/Settings.cs
diff --git a/GitCommands/GitCommands/ShortDiff.cs → GitCommands/ShortDiff.cs b/GitCommands/GitCommands/ShortDiff.cs → GitCommands/ShortDiff.cs
diff --git a/GitCommands/GitCommands/app.config → GitCommands/app.config b/GitCommands/GitCommands/app.config → GitCommands/app.config
diff --git a/...ommands/GitCommands/gitcommandkey.snk.pfx → GitCommands/gitcommandkey.snk.pfx b/...ommands/GitCommands/gitcommandkey.snk.pfx → GitCommands/gitcommandkey.snk.pfx
diff --git a/GitCommands/GitCommands/patch/Patch.cs → GitCommands/patch/Patch.cs b/GitCommands/GitCommands/patch/Patch.cs → GitCommands/patch/Patch.cs
diff --git a/GitCommands/GitCommands/patch/PatchFile.cs → GitCommands/patch/PatchFile.cs b/GitCommands/GitCommands/patch/PatchFile.cs → GitCommands/patch/PatchFile.cs
diff --git a/...ommands/GitCommands/patch/PatchManager.cs → GitCommands/patch/PatchManager.cs b/...ommands/GitCommands/patch/PatchManager.cs → GitCommands/patch/PatchManager.cs
diff --git a/...mmands/GitExtensions/GitExtensions.csproj → GitExtensions/GitExtensions.csproj b/...mmands/GitExtensions/GitExtensions.csproj → GitExtensions/GitExtensions.csproj
@@ -83,27 +83,27 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\GitUI\GitUI.csproj">
+    <ProjectReference Include="..\GitUI\GitUI.csproj">
       <Project>{CF5B22E7-230F-4E50-BE88-C4F7023CED2C}</Project>
       <Name>GitUI</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Plugins\AutoCheckForUpdates\AutoCheckForUpdates.csproj">
+    <ProjectReference Include="..\Plugins\AutoCheckForUpdates\AutoCheckForUpdates.csproj">
       <Project>{330F1115-B3DE-47F1-8A7E-D181E59E96E0}</Project>
       <Name>AutoCheckForUpdates</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Plugins\AutoCompileSubmodules\AutoCompileSubmodules\AutoCompileSubmodules.csproj">
+    <ProjectReference Include="..\Plugins\AutoCompileSubmodules\AutoCompileSubmodules\AutoCompileSubmodules.csproj">
       <Project>{7E5433F4-DD13-4D8E-95B2-59B4FFE7D636}</Project>
       <Name>AutoCompileSubmodules</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Plugins\GitUIPluginInterfaces\GitUIPluginInterfaces.csproj">
+    <ProjectReference Include="..\Plugins\GitUIPluginInterfaces\GitUIPluginInterfaces.csproj">
       <Project>{27559302-F35E-4B62-A6EC-11FF21A5FA6F}</Project>
       <Name>GitUIPluginInterfaces</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Plugins\Gource\Gource.csproj">
+    <ProjectReference Include="..\Plugins\Gource\Gource.csproj">
       <Project>{687A73BB-12A0-4AF7-B420-4A9C47DB75CB}</Project>
       <Name>Gource</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Plugins\Statistics\GitStatistics\GitStatistics.csproj">
+    <ProjectReference Include="..\Plugins\Statistics\GitStatistics\GitStatistics.csproj">
       <Project>{92B57383-233E-46AE-8A86-6E98BF349A72}</Project>
       <Name>GitStatistics</Name>
     </ProjectReference>

diff --git a/...tExtensions/GitPluginSettingsContainer.cs → GitExtensions/GitPluginSettingsContainer.cs b/...tExtensions/GitPluginSettingsContainer.cs → GitExtensions/GitPluginSettingsContainer.cs
diff --git a/GitCommands/GitExtensions/LoadPlugins.cs → GitExtensions/LoadPlugins.cs b/GitCommands/GitExtensions/LoadPlugins.cs → GitExtensions/LoadPlugins.cs
diff --git a/GitCommands/GitExtensions/Program.cs → GitExtensions/Program.cs b/GitCommands/GitExtensions/Program.cs → GitExtensions/Program.cs
diff --git a/.../GitExtensions/Properties/AssemblyInfo.cs → GitExtensions/Properties/AssemblyInfo.cs b/.../GitExtensions/Properties/AssemblyInfo.cs → GitExtensions/Properties/AssemblyInfo.cs
diff --git a/...tensions/Properties/Resources.Designer.cs → ...tensions/Properties/Resources.Designer.cs b/...tensions/Properties/Resources.Designer.cs → ...tensions/Properties/Resources.Designer.cs
diff --git a/...s/GitExtensions/Properties/Resources.resx → GitExtensions/Properties/Resources.resx b/...s/GitExtensions/Properties/Resources.resx → GitExtensions/Properties/Resources.resx
diff --git a/...xtensions/Properties/Settings.Designer.cs → ...xtensions/Properties/Settings.Designer.cs b/...xtensions/Properties/Settings.Designer.cs → ...xtensions/Properties/Settings.Designer.cs
diff --git a/...itExtensions/Properties/Settings.settings → GitExtensions/Properties/Settings.settings b/...itExtensions/Properties/Settings.settings → GitExtensions/Properties/Settings.settings
diff --git a/GitCommands/GitExtensions/ShortDiff.cs → GitExtensions/ShortDiff.cs b/GitCommands/GitExtensions/ShortDiff.cs → GitExtensions/ShortDiff.cs
diff --git a/GitCommands/GitExtensions/app.config → GitExtensions/app.config b/GitCommands/GitExtensions/app.config → GitExtensions/app.config
diff --git a/GitCommands/GitExtensions/cow-head.ico → GitExtensions/cow-head.ico b/GitCommands/GitExtensions/cow-head.ico → GitExtensions/cow-head.ico
diff --git a/GitUI/GitUI.csproj b/GitUI/GitUI.csproj
@@ -790,11 +790,11 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\GitCommands\GitCommands\GitCommands.csproj">
+    <ProjectReference Include="..\GitCommands\GitCommands.csproj">
       <Project>{BD6AA2A2-997D-4AFF-ACC7-B64F6E51D181}</Project>
       <Name>GitCommands</Name>
     </ProjectReference>
-    <ProjectReference Include="..\GitCommands\ResourceManager\ResourceManager.csproj">
+    <ProjectReference Include="..\ResourceManager\ResourceManager.csproj">
       <Project>{D3440FD7-AFC5-4351-8741-6CDBF15CE944}</Project>
       <Name>ResourceManager</Name>
     </ProjectReference>

diff --git a/Cow.png → GitUI/Icons/Cow.png b/Cow.png → GitUI/Icons/Cow.png
diff --git a/Cow_sunglass.png → GitUI/Icons/Cow_sunglass.png b/Cow_sunglass.png → GitUI/Icons/Cow_sunglass.png
diff --git a/Cow_xmass.png → GitUI/Icons/Cow_xmass.png b/Cow_xmass.png → GitUI/Icons/Cow_xmass.png
diff --git a/Donate.jpg → GitUI/Icons/Donate.jpg b/Donate.jpg → GitUI/Icons/Donate.jpg
diff --git a/arrow_refresh.png → GitUI/Icons/arrow_refresh.png b/arrow_refresh.png → GitUI/Icons/arrow_refresh.png
diff --git a/arrow_refresh_dirty.png → GitUI/Icons/arrow_refresh_dirty.png b/arrow_refresh_dirty.png → GitUI/Icons/arrow_refresh_dirty.png
diff --git a/error.png → GitUI/Icons/error.png b/error.png → GitUI/Icons/error.png
diff --git a/loading.gif → GitUI/Icons/loading.gif b/loading.gif → GitUI/Icons/loading.gif
diff --git a/loading2.gif → GitUI/Icons/loading2.gif b/loading2.gif → GitUI/Icons/loading2.gif
diff --git a/loading3.gif → GitUI/Icons/loading3.gif b/loading3.gif → GitUI/Icons/loading3.gif
diff --git a/loading4.gif → GitUI/Icons/loading4.gif b/loading4.gif → GitUI/Icons/loading4.gif
diff --git a/loadingpanel.gif → GitUI/Icons/loadingpanel.gif b/loadingpanel.gif → GitUI/Icons/loadingpanel.gif
diff --git a/lock.png → GitUI/Icons/lock.png b/lock.png → GitUI/Icons/lock.png
diff --git a/lock2.png → GitUI/Icons/lock2.png b/lock2.png → GitUI/Icons/lock2.png
diff --git a/pageant.ico → GitUI/Icons/pageant.ico b/pageant.ico → GitUI/Icons/pageant.ico
diff --git a/putty.ico → GitUI/Icons/putty.ico b/putty.ico → GitUI/Icons/putty.ico
diff --git a/puttygen.ico → GitUI/Icons/puttygen.ico b/puttygen.ico → GitUI/Icons/puttygen.ico
diff --git a/GitUI/Translation/Dutch.xml b/GitUI/Translation/Dutch.xml
@@ -219,7 +219,7 @@ Om rondzwevende objeten te herstellen, label de commit and deze zal weer in het
           <Value>Auteur: {0}</Value>
         </TranslationItem>
         <TranslationItem Name="dateInfo" Property="Text">
-          <Value>Commit datum: {0)</Value>
+          <Value>Commit datum: {0}</Value>
         </TranslationItem>
         <TranslationItem Name="commitMessage" Property="Text">
           <Value>Bericht: {0}</Value>
@@ -689,9 +689,6 @@ _ReSharper*/
         <TranslationItem Name="$this" Property="Text">
           <Value>Bestandswijzigingen terugzetten</Value>
         </TranslationItem>
-        <TranslationItem Name="RevertLabel" Property="Text">
-          <Value>label1</Value>
-        </TranslationItem>
         <TranslationItem Name="Revert" Property="Text">
           <Value>Wijzigingen terugzetten</Value>
         </TranslationItem>

diff --git a/GitCommands/LocalTestRun.testrunconfig → LocalTestRun.testrunconfig b/GitCommands/LocalTestRun.testrunconfig → LocalTestRun.testrunconfig
diff --git a/README.TXT b/README.TXT
@@ -2,7 +2,6 @@ How to compile GitExtensions
 ============================
 
 -Open the solution file (\GitCommands\GitCommands.sln)
--First remove signing from the projects
 -Compile SimpleShlExt in release for 64bit windows
 -Compile SimpleShlExt in release for 32bit windows
 -Compile entire solution in release, mixed platforms

diff --git a/...esourceManager/Properties/AssemblyInfo.cs → ResourceManager/Properties/AssemblyInfo.cs b/...esourceManager/Properties/AssemblyInfo.cs → ResourceManager/Properties/AssemblyInfo.cs
diff --git a/...ds/ResourceManager/ResourceManager.csproj → ResourceManager/ResourceManager.csproj b/...ds/ResourceManager/ResourceManager.csproj → ResourceManager/ResourceManager.csproj
diff --git a/...esourceManager/Translation/Translation.cs → ResourceManager/Translation/Translation.cs b/...esourceManager/Translation/Translation.cs → ResourceManager/Translation/Translation.cs
diff --git a/...anager/Translation/TranslationCategory.cs → ...anager/Translation/TranslationCategory.cs b/...anager/Translation/TranslationCategory.cs → ...anager/Translation/TranslationCategory.cs
diff --git a/...rceManager/Translation/TranslationItem.cs → ...rceManager/Translation/TranslationItem.cs b/...rceManager/Translation/TranslationItem.cs → ...rceManager/Translation/TranslationItem.cs
diff --git a/...ager/Translation/TranslationSerializer.cs → ...ager/Translation/TranslationSerializer.cs b/...ager/Translation/TranslationSerializer.cs → ...ager/Translation/TranslationSerializer.cs
diff --git a/...eManager/Translation/TranslationString.cs → ...eManager/Translation/TranslationString.cs b/...eManager/Translation/TranslationString.cs → ...eManager/Translation/TranslationString.cs
diff --git a/...ResourceManager/Translation/Translator.cs → ResourceManager/Translation/Translator.cs b/...ResourceManager/Translation/Translator.cs → ResourceManager/Translation/Translator.cs
diff --git a/Setup/Product.wxs b/Setup/Product.wxs
@@ -73,22 +73,22 @@
         <File Source="..\bin\GitExtensionsUserManual.pdf"/>
       </Component>
       <Component Id="GitExtensions.exe" Guid="*">
-        <File Source="..\GitCommands\GitExtensions\bin\Release\GitExtensions.exe"/>
+        <File Source="..\GitExtensions\bin\Release\GitExtensions.exe"/>
       </Component>
       <Component Id="GitCommands.dll" Guid="*">
-        <File Source="..\GitCommands\GitExtensions\bin\Release\GitCommands.dll"/>
+        <File Source="..\GitExtensions\bin\Release\GitCommands.dll"/>
       </Component>
       <Component Id="GitUI.dll" Guid="*">
-        <File Source="..\GitCommands\GitExtensions\bin\Release\GitUI.dll"/>
+        <File Source="..\GitExtensions\bin\Release\GitUI.dll"/>
       </Component>
       <Component Id="ICSharpCode.TextEditor.dll" Guid="*">
-        <File Source="..\GitCommands\GitExtensions\bin\Release\ICSharpCode.TextEditor.dll"/>
+        <File Source="..\bin\ICSharpCode.TextEditor.dll"/>
       </Component>
       <Component Id="SpellChecker.dll" Guid="*">
-        <File Source="..\GitCommands\GitExtensions\bin\Release\SpellChecker.dll"/>
+        <File Source="..\GitExtensions\bin\Release\SpellChecker.dll"/>
       </Component>
       <Component Id="GitUIPluginInterfaces.dll" Guid="*">
-        <File Source="..\GitCommands\GitExtensions\bin\Release\GitUIPluginInterfaces.dll"/>
+        <File Source="..\GitExtensions\bin\Release\GitUIPluginInterfaces.dll"/>
       </Component>
 
       <?define ShellExCLSID = "{3C16B20A-BA16-4156-916F-0A375ECFFE24}"?>
@@ -138,7 +138,7 @@
         <File Source="..\Plugins\Gource\bin\Release\Gource.dll"/>
       </Component>
       <Component Id="ICSharpCode.SharpZipLib.dll" Guid="*">
-        <File Source="..\GitCommands\GitExtensions\bin\Release\ICSharpCode.SharpZipLib.dll"/>
+        <File Source="..\bin\ICSharpCode.SharpZipLib.dll"/>
       </Component>
     </DirectoryRef>
 

diff --git a/TODO.txt b/TODO.txt
@@ -5,8 +5,6 @@ TODO:
 
 -Renamed items show as deleted/new in the commit dialog. It should be possible to detect renames there.
 
--Add seach function and line numbers to blame view
-
 -Improve Visual Studio intergration
 	-Command bar is repositionized every time visual studio is started
 

diff --git a/test.cmd b/test.cmd
diff --git a/test.ico b/test.ico