Merge branch 'master' of git://github.com/wesnoth/wesnoth

wesnoth · Jun 2, 2014 · a706e05 · a706e05
2 parents 4d18844 + ac04662
commit a706e05
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj b/projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
@@ -926,6 +926,9 @@
 		ECFA82E5184E59F3006782FB /* hotkey_item.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECFA82DE184E59F3006782FB /* hotkey_item.cpp */; };
 		ECFA82E6184E59F3006782FB /* hotkey_manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECFA82E0184E59F3006782FB /* hotkey_manager.cpp */; };
 		ECFA82E7184E59F3006782FB /* hotkey_preferences_display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECFA82E2184E59F3006782FB /* hotkey_preferences_display.cpp */; };
+		ECFB9FA8193BFAD900146ED0 /* carryover.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECFB9FA7193BFAD900146ED0 /* carryover.cpp */; };
+		ECFB9FAA193BFB4B00146ED0 /* game_board.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECFB9FA9193BFB4B00146ED0 /* game_board.cpp */; };
+		ECFB9FAC193BFB6E00146ED0 /* rect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECFB9FAB193BFB6E00146ED0 /* rect.cpp */; };
 		F419A1F414E21246002F9ADC /* game_end_exceptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F419A1F314E21246002F9ADC /* game_end_exceptions.cpp */; };
 		F419A2C314F5BCFE002F9ADC /* info.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F419A2C114F5BCFE002F9ADC /* info.cpp */; };
 		F419A31214F8868A002F9ADC /* manager_ui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F419A31014F8868A002F9ADC /* manager_ui.cpp */; };
@@ -2148,6 +2151,9 @@
 		ECFA82E0184E59F3006782FB /* hotkey_manager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = hotkey_manager.cpp; path = hotkey/hotkey_manager.cpp; sourceTree = "<group>"; };
 		ECFA82E1184E59F3006782FB /* hotkey_manager.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = hotkey_manager.hpp; path = hotkey/hotkey_manager.hpp; sourceTree = "<group>"; };
 		ECFA82E2184E59F3006782FB /* hotkey_preferences_display.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = hotkey_preferences_display.cpp; path = hotkey/hotkey_preferences_display.cpp; sourceTree = "<group>"; };
+		ECFB9FA7193BFAD900146ED0 /* carryover.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = carryover.cpp; sourceTree = "<group>"; };
+		ECFB9FA9193BFB4B00146ED0 /* game_board.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = game_board.cpp; sourceTree = "<group>"; };
+		ECFB9FAB193BFB6E00146ED0 /* rect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = rect.cpp; path = sdl/rect.cpp; sourceTree = "<group>"; };
 		F40C04821706613100B4DA68 /* tip.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = tip.hpp; sourceTree = "<group>"; };
 		F40C04831706613100B4DA68 /* popup.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = popup.hpp; sourceTree = "<group>"; };
 		F40C04841706613100B4DA68 /* mp_login.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mp_login.hpp; sourceTree = "<group>"; };
@@ -2417,6 +2423,9 @@
 		29B97315FDCFA39411CA2CEA /* src */ = {
 			isa = PBXGroup;
 			children = (
+				ECFB9FAB193BFB6E00146ED0 /* rect.cpp */,
+				ECFB9FA9193BFB4B00146ED0 /* game_board.cpp */,
+				ECFB9FA7193BFAD900146ED0 /* carryover.cpp */,
 				ECBBD73B1928F3F100E434C6 /* terrain_builder.cpp */,
 				ECBBD73C1928F3F100E434C6 /* terrain_builder.hpp */,
 				EC51DB7618F8BFA4004621D9 /* playturn_network_adapter.cpp */,
@@ -4200,6 +4209,7 @@
 				B5599B270EC62181008DD061 /* md5.cpp in Sources */,
 				B5599B280EC62181008DD061 /* marked-up_text.cpp in Sources */,
 				B5599B2B0EC62181008DD061 /* map_location.cpp in Sources */,
+				ECFB9FA8193BFAD900146ED0 /* carryover.cpp in Sources */,
 				B5599B2C0EC62181008DD061 /* map_label.cpp in Sources */,
 				B5599B2E0EC62181008DD061 /* map.cpp in Sources */,
 				B5599B2F0EC62181008DD061 /* log.cpp in Sources */,
@@ -4464,6 +4474,7 @@
 				B52EE91512135AC300CFBDAB /* action.cpp in Sources */,
 				B52EE91612135AC300CFBDAB /* attack.cpp in Sources */,
 				EC89A13F1879D17D00A3B0B1 /* lparser.cpp in Sources */,
+				ECFB9FAC193BFB6E00146ED0 /* rect.cpp in Sources */,
 				B52EE91812135AC300CFBDAB /* manager.cpp in Sources */,
 				B52EE91A12135AC300CFBDAB /* move.cpp in Sources */,
 				B52EE91B12135AC300CFBDAB /* recall.cpp in Sources */,
@@ -4497,6 +4508,7 @@
 				4944F4191354FBCD0027E614 /* drawing.cpp in Sources */,
 				4944F41B1354FBFF0027E614 /* teleport.cpp in Sources */,
 				49DA0D1E13550E1E000AFEBD /* mp_change_control.cpp in Sources */,
+				ECFB9FAA193BFB4B00146ED0 /* game_board.cpp in Sources */,
 				49DA0D2E13550E9B000AFEBD /* iterator.cpp in Sources */,
 				49DA0D2F13550E9B000AFEBD /* walker_grid.cpp in Sources */,
 				49DA0D3013550E9B000AFEBD /* walker_widget.cpp in Sources */,