upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-20 16:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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.hpp" />
<Unit filename="..\..\src\gui\dialogs\mp_create_game_set_password.cpp" /> <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_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.cpp" />
<Unit filename="..\..\src\gui\dialogs\mp_method_selection.hpp" /> <Unit filename="..\..\src\gui\dialogs\mp_method_selection.hpp" />
<Unit filename="..\..\src\gui\dialogs\popup.cpp" /> <Unit filename="..\..\src\gui\dialogs\popup.cpp" />

40
projectfiles/VC9/wesnoth.vcproj
View File

@ -2482,6 +2482,34 @@
/> />
</FileConfiguration> </FileConfiguration>
</File> </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 <File
RelativePath="..\..\src\gui\dialogs\mp_method_selection.cpp" RelativePath="..\..\src\gui\dialogs\mp_method_selection.cpp"
> >
@ -2810,10 +2838,6 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
</Filter> </Filter>
<Filter
Name="Image_Message"
>
</Filter>
</Filter> </Filter>
<Filter <Filter
Name="Auxiliary" Name="Auxiliary"
@ -7477,6 +7501,10 @@
RelativePath="..\..\src\gui\dialogs\mp_create_game_set_password.hpp" RelativePath="..\..\src\gui\dialogs\mp_create_game_set_password.hpp"
> >
</File> </File>
<File
RelativePath="..\..\src\gui\dialogs\mp_login.hpp"
>
</File>
<File <File
RelativePath="..\..\src\gui\dialogs\mp_method_selection.hpp" RelativePath="..\..\src\gui\dialogs\mp_method_selection.hpp"
> >
@ -7529,10 +7557,6 @@
> >
</File> </File>
</Filter> </Filter>
<Filter
Name="Image_Message"
>
</Filter>
</Filter> </Filter>
<Filter <Filter
Name="Widgets" Name="Widgets"