0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

project files update, resolving a conflict

Browse source
This commit is contained in:
Anonymissimus 2011-03-06 17:40:01 +00:00
parent 46878fcd94
commit 340f0d1765
2 changed files with 34 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
projectfiles/CodeBlocks/wesnoth.cbp
View file

@ -436,6 +436,8 @@
<Unit filename="..\..\src\gui\dialogs\mp_create_game.hpp" />
<Unit filename="..\..\src\gui\dialogs\mp_create_game_set_password.cpp" />
<Unit filename="..\..\src\gui\dialogs\mp_create_game_set_password.hpp" />
<Unit filename="..\..\src\gui\dialogs\mp_login.cpp" />
<Unit filename="..\..\src\gui\dialogs\mp_login.hpp" />
<Unit filename="..\..\src\gui\dialogs\mp_method_selection.cpp" />
<Unit filename="..\..\src\gui\dialogs\mp_method_selection.hpp" />
<Unit filename="..\..\src\gui\dialogs\popup.cpp" />

40
projectfiles/VC9/wesnoth.vcproj
View file

@ -2482,6 +2482,34 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\gui\dialogs\mp_login.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Gui\Dialogs\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Gui\Dialogs\"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug (fast)|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Gui\Dialogs\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\gui\dialogs\mp_method_selection.cpp"
>
@ -2810,10 +2838,6 @@
</FileConfiguration>
</File>
</Filter>
<Filter
Name="Image_Message"
>
</Filter>
</Filter>
<Filter
Name="Auxiliary"
@ -7477,6 +7501,10 @@
RelativePath="..\..\src\gui\dialogs\mp_create_game_set_password.hpp"
>
</File>
<File
RelativePath="..\..\src\gui\dialogs\mp_login.hpp"
>
</File>
<File
RelativePath="..\..\src\gui\dialogs\mp_method_selection.hpp"
>
@ -7529,10 +7557,6 @@
>
</File>
</Filter>
<Filter
Name="Image_Message"
>
</Filter>
</Filter>
<Filter
Name="Widgets"