Author: anonymissimus Date: Sun Mar 6 18:40:01 2011 New Revision: 48788 URL: http://svn.gna.org/viewcvs/wesnoth?rev=48788&view=rev Log: project files update, resolving a conflict
Modified:
trunk/projectfiles/CodeBlocks/wesnoth.cbp
trunk/projectfiles/VC9/wesnoth.vcproj
Modified: trunk/projectfiles/CodeBlocks/wesnoth.cbp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/projectfiles/CodeBlocks/wesnoth.cbp?rev=48788&r1=48787&r2=48788&view=diff
==============================================================================
--- trunk/projectfiles/CodeBlocks/wesnoth.cbp (original)
+++ trunk/projectfiles/CodeBlocks/wesnoth.cbp Sun Mar 6 18:40:01 2011
@@ -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" />
Modified: trunk/projectfiles/VC9/wesnoth.vcproj
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/projectfiles/VC9/wesnoth.vcproj?rev=48788&r1=48787&r2=48788&view=diff
==============================================================================
--- trunk/projectfiles/VC9/wesnoth.vcproj (original)
+++ trunk/projectfiles/VC9/wesnoth.vcproj Sun Mar 6 18:40:01 2011
@@ -2483,6 +2483,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"
>
<FileConfiguration
@@ -2809,10 +2837,6 @@
/>
</FileConfiguration>
</File>
- </Filter>
- <Filter
- Name="Image_Message"
- >
</Filter>
</Filter>
<Filter
@@ -7478,6 +7502,10 @@
>
</File>
<File
+
RelativePath="..\..\src\gui\dialogs\mp_login.hpp"
+ >
+ </File>
+ <File
RelativePath="..\..\src\gui\dialogs\mp_method_selection.hpp"
>
</File>
@@ -7528,10 +7556,6 @@
RelativePath="..\..\src\gui\dialogs\addon\description.hpp"
>
</File>
- </Filter>
- <Filter
- Name="Image_Message"
- >
</Filter>
</Filter>
<Filter
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
