Merge branch 'master' of github.com:lordmulder/LameXP

This commit is contained in:
LoRd_MuldeR 2012-10-05 23:59:30 +02:00
commit 80fb69bed5
2 changed files with 34 additions and 1 deletions

View File

@ -2758,6 +2758,40 @@
<Filter <Filter
Name="Dialogs" Name="Dialogs"
> >
<File
RelativePath=".\gui\AboutDialog.ui"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="UIC &quot;$(SolutionDir)tmp\UIC_$(SafeInputName).h&quot;"
CommandLine="&quot;$(QTDIR)\bin\uic.exe&quot; -o &quot;$(SolutionDir)tmp\UIC_$(SafeInputName).h&quot; &quot;$(InputPath)&quot;"
Outputs="&quot;$(SolutionDir)tmp\UIC_$(SafeInputName).h&quot;"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="UIC &quot;$(SolutionDir)tmp\UIC_$(SafeInputName).h&quot;"
CommandLine="&quot;$(QTDIR)\bin\uic.exe&quot; -o &quot;$(SolutionDir)tmp\UIC_$(SafeInputName).h&quot; &quot;$(InputPath)&quot;"
Outputs="&quot;$(SolutionDir)tmp\UIC_$(SafeInputName).h&quot;"
/>
</FileConfiguration>
<FileConfiguration
Name="Release_Static|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="UIC &quot;$(SolutionDir)tmp\UIC_$(SafeInputName).h&quot;"
CommandLine="&quot;$(QTDIR)\bin\uic.exe&quot; -o &quot;$(SolutionDir)tmp\UIC_$(SafeInputName).h&quot; &quot;$(InputPath)&quot;"
Outputs="&quot;$(SolutionDir)tmp\UIC_$(SafeInputName).h&quot;"
/>
</FileConfiguration>
</File>
<File <File
RelativePath=".\gui\CueSheetImport.ui" RelativePath=".\gui\CueSheetImport.ui"
> >

View File

@ -38,7 +38,6 @@
<file>icons/control_play_blue.png</file> <file>icons/control_play_blue.png</file>
<file>icons/cpu.png</file> <file>icons/cpu.png</file>
<file>icons/cross.png</file> <file>icons/cross.png</file>
<file>icons/crown.png</file>
<file>icons/date.png</file> <file>icons/date.png</file>
<file>icons/delete.png</file> <file>icons/delete.png</file>
<file>icons/disk.png</file> <file>icons/disk.png</file>