comparison Events2D.h @ 1650:b0a2b8525483

Merge
author Grumpy7
date Wed, 18 Sep 2013 06:32:15 +0200
parents dbd6f940f26c
children
comparison
equal deleted inserted replaced
1649:d25389b91029 1650:b0a2b8525483
14 BuildingType_SpiritGuild = 9, 14 BuildingType_SpiritGuild = 9,
15 BuildingType_MindGuild = 10, 15 BuildingType_MindGuild = 10,
16 BuildingType_BodyGuild = 11, 16 BuildingType_BodyGuild = 11,
17 BuildingType_LightGuild = 12, 17 BuildingType_LightGuild = 12,
18 BuildingType_DarkGuild = 13, 18 BuildingType_DarkGuild = 13,
19 BuildingType_14 = 14, 19 BuildingType_ElementalGuild = 14,
20 BuildingType_15 = 15, 20 BuildingType_SelfGuild = 15,
21 BuildingType_16 = 16, 21 BuildingType_16 = 16,
22 BuildingType_TownHall = 17, 22 BuildingType_TownHall = 17,
23 BuildingType_18 = 18, 23 BuildingType_18 = 18,
24 BuildingType_19 = 19, 24 BuildingType_19 = 19,
25 BuildingType_Throne_Room = 20, 25 BuildingType_Throne_Room = 20,