Loading...   


Auto-merging zone/zoning.cpp
Auto-merging zone/zonedump.h
Auto-merging zone/zonedb.h
Auto-merging zone/zonedb.cpp
CONFLICT (content): Merge conflict in zone/zonedb.cpp
Auto-merging zone/zone_config.h
Auto-merging zone/zone_config.cpp
Auto-merging zone/zone.h
Auto-merging zone/zone.cpp
CONFLICT (content): Merge conflict in zone/zone.cpp
Auto-merging zone/worldserver.cpp
Auto-merging zone/waypoints.cpp
CONFLICT (modify/delete): zone/tribute.cpp deleted in HEAD and modified in upstream/master. Version upstream/master of zone/tribute.cpp left in tree.
Auto-merging zone/trading.cpp
CONFLICT (content): Merge conflict in zone/trading.cpp
Auto-merging zone/tradeskills.cpp
CONFLICT (content): Merge conflict in zone/tradeskills.cpp
Auto-merging zone/titles.cpp
CONFLICT (modify/delete): zone/tasks.cpp deleted in HEAD and modified in upstream/master. Version upstream/master of zone/tasks.cpp left in tree.
Auto-merging zone/string_ids.h
Auto-merging zone/spells.cpp
CONFLICT (content): Merge conflict in zone/spells.cpp
Auto-merging zone/spell_effects.cpp
CONFLICT (content): Merge conflict in zone/spell_effects.cpp
Auto-merging zone/special_attacks.cpp
CONFLICT (content): Merge conflict in zone/special_attacks.cpp
Auto-merging zone/spawngroup.cpp
Auto-merging zone/spawn2.cpp
Auto-merging zone/raycast_mesh.cpp
Auto-merging zone/raids.cpp
Auto-merging zone/questmgr.cpp
CONFLICT (content): Merge conflict in zone/questmgr.cpp
Auto-merging zone/quest_parser_collection.h
Auto-merging zone/quest_parser_collection.cpp
Auto-merging zone/quest_interface.h
Auto-merging zone/quest.cpp
Auto-merging zone/qglobals.h
Auto-merging zone/qglobals.cpp
Auto-merging zone/pets.cpp
CONFLICT (content): Merge conflict in zone/pets.cpp
Auto-merging zone/petitions.cpp
Auto-merging zone/perl_questitem.cpp
Auto-merging zone/perl_mob.cpp
Auto-merging zone/perl_client.cpp
CONFLICT (content): Merge conflict in zone/perl_client.cpp
Auto-merging zone/pathing.cpp
Auto-merging zone/object.h
Auto-merging zone/object.cpp
CONFLICT (content): Merge conflict in zone/object.cpp
Auto-merging zone/npc.h
CONFLICT (content): Merge conflict in zone/npc.h
Auto-merging zone/npc.cpp
Auto-merging zone/net.cpp
CONFLICT (content): Merge conflict in zone/net.cpp
Auto-merging zone/mod_functions.cpp
Auto-merging zone/mob_ai.cpp
Auto-merging zone/mob.h
CONFLICT (content): Merge conflict in zone/mob.h
Auto-merging zone/mob.cpp
CONFLICT (content): Merge conflict in zone/mob.cpp
CONFLICT (modify/delete): zone/merc.h deleted in HEAD and modified in upstream/master. Version upstream/master of zone/merc.h left in tree.
CONFLICT (modify/delete): zone/merc.cpp deleted in HEAD and modified in upstream/master. Version upstream/master of zone/merc.cpp left in tree.
Auto-merging zone/lua_parser_events.h
CONFLICT (content): Merge conflict in zone/lua_parser_events.h
Auto-merging zone/lua_parser_events.cpp
CONFLICT (content): Merge conflict in zone/lua_parser_events.cpp
Auto-merging zone/lua_parser.cpp
Auto-merging zone/lua_general.cpp
CONFLICT (content): Merge conflict in zone/lua_general.cpp
Auto-merging zone/lua_client.cpp
CONFLICT (content): Merge conflict in zone/lua_client.cpp
Auto-merging zone/inventory.cpp
CONFLICT (content): Merge conflict in zone/inventory.cpp
Auto-merging zone/hate_list.cpp
Auto-merging zone/guild_mgr.cpp
CONFLICT (content): Merge conflict in zone/guild_mgr.cpp
Auto-merging zone/guild.cpp
Auto-merging zone/groups.cpp
Auto-merging zone/forage.cpp
CONFLICT (content): Merge conflict in zone/forage.cpp
Auto-merging zone/exp.cpp
CONFLICT (content): Merge conflict in zone/exp.cpp
Auto-merging zone/entity.h
Auto-merging zone/entity.cpp
Auto-merging zone/embparser_api.cpp
Auto-merging zone/embparser.cpp
Auto-merging zone/effects.cpp
Auto-merging zone/doors.cpp
CONFLICT (content): Merge conflict in zone/doors.cpp
Auto-merging zone/corpse.cpp
CONFLICT (content): Merge conflict in zone/corpse.cpp
Auto-merging zone/common.h
Auto-merging zone/command.h
Auto-merging zone/command.cpp
CONFLICT (content): Merge conflict in zone/command.cpp
Auto-merging zone/client_process.cpp
CONFLICT (content): Merge conflict in zone/client_process.cpp
Auto-merging zone/client_packet.h
CONFLICT (content): Merge conflict in zone/client_packet.h
Auto-merging zone/client_packet.cpp
CONFLICT (content): Merge conflict in zone/client_packet.cpp
Auto-merging zone/client_mods.cpp
CONFLICT (content): Merge conflict in zone/client_mods.cpp
Auto-merging zone/client.h
CONFLICT (content): Merge conflict in zone/client.h
Auto-merging zone/client.cpp
CONFLICT (content): Merge conflict in zone/client.cpp
CONFLICT (modify/delete): zone/botspellsai.cpp deleted in HEAD and modified in upstream/master. Version upstream/master of zone/botspellsai.cpp left in tree.
CONFLICT (rename/delete): zone/bot_structs.h deleted in HEAD and renamed in upstream/master. Version upstream/master of zone/bot_structs.h left in tree.
CONFLICT (modify/delete): zone/bot.h deleted in HEAD and modified in upstream/master. Version upstream/master of zone/bot.h left in tree.
CONFLICT (modify/delete): zone/bot.cpp deleted in HEAD and modified in upstream/master. Version upstream/master of zone/bot.cpp left in tree.
Auto-merging zone/bonuses.cpp
CONFLICT (content): Merge conflict in zone/bonuses.cpp
Auto-merging zone/attack.cpp
CONFLICT (content): Merge conflict in zone/attack.cpp
Auto-merging zone/aggro.cpp
Auto-merging zone/aa.h
Auto-merging zone/aa.cpp
CONFLICT (content): Merge conflict in zone/aa.cpp
Removing zone/NpcAI.cpp
Auto-merging zone/CMakeLists.txt
CONFLICT (content): Merge conflict in zone/CMakeLists.txt
Auto-merging world/zoneserver.cpp
CONFLICT (content): Merge conflict in world/zoneserver.cpp
Auto-merging world/worlddb.h
Auto-merging world/worlddb.cpp
Auto-merging world/world_config.h
Auto-merging world/world_config.cpp
Auto-merging world/queryserv.cpp
Auto-merging world/perl_http_request.cpp
Auto-merging world/perl_eqw.cpp
Auto-merging world/perl_eql_config.cpp
Auto-merging world/net.cpp
CONFLICT (content): Merge conflict in world/net.cpp
Auto-merging world/login_server_list.h
Auto-merging world/login_server_list.cpp
Auto-merging world/login_server.h
Auto-merging world/login_server.cpp
CONFLICT (modify/delete): world/lfplist.cpp deleted in HEAD and modified in upstream/master. Version upstream/master of world/lfplist.cpp left in tree.
Auto-merging world/launcher_list.cpp
Auto-merging world/launcher_link.h
Auto-merging world/launcher_link.cpp
Auto-merging world/http_request.cpp
Auto-merging world/eqw_parser.cpp
Auto-merging world/eqw_http_handler.h
Auto-merging world/eqw_http_handler.cpp
Auto-merging world/eqw.cpp
Auto-merging world/eql_config.cpp
Auto-merging world/console.cpp
Auto-merging world/clientlist.cpp
Auto-merging world/cliententry.cpp
Auto-merging world/client.h
Auto-merging world/client.cpp
CONFLICT (content): Merge conflict in world/client.cpp
CONFLICT (rename/delete): world/adventure_template.h deleted in HEAD and renamed in upstream/master. Version upstream/master of world/adventure_template.h left in tree.
CONFLICT (rename/delete): world/adventure_manager.h deleted in HEAD and renamed in upstream/master. Version upstream/master of world/adventure_manager.h left in tree.
CONFLICT (rename/delete): world/adventure_manager.cpp deleted in HEAD and renamed in upstream/master. Version upstream/master of world/adventure_manager.cpp left in tree.
CONFLICT (rename/delete): world/adventure.h deleted in HEAD and renamed in upstream/master. Version upstream/master of world/adventure.h left in tree.
CONFLICT (rename/delete): world/adventure.cpp deleted in HEAD and renamed in upstream/master. Version upstream/master of world/adventure.cpp left in tree.
Auto-merging world/CMakeLists.txt
CONFLICT (content): Merge conflict in world/CMakeLists.txt
CONFLICT (rename/delete): web_interface/worldserver.h deleted in upstream/master and renamed in HEAD. Version HEAD of web_interface/worldserver.h left in tree.
CONFLICT (rename/delete): web_interface/worldserver.cpp deleted in upstream/master and renamed in HEAD. Version HEAD of web_interface/worldserver.cpp left in tree.
CONFLICT (rename/delete): web_interface/web_connection.h deleted in upstream/master and renamed in HEAD. Version HEAD of web_interface/web_connection.h left in tree.
CONFLICT (rename/delete): web_interface/web_connection.cpp deleted in upstream/master and renamed in HEAD. Version HEAD of web_interface/web_connection.cpp left in tree.
Auto-merging utils/deprecated/player_profile_set/player_profile_set/database.h
Auto-merging utils/deprecated/player_profile_set/player_profile_set/MiscFunctions.cpp
Auto-merging ucs/ucs.cpp
Auto-merging ucs/clientlist.cpp
Auto-merging shared_memory/main.cpp
Auto-merging queryserv/worldserver.cpp
CONFLICT (content): Merge conflict in queryserv/worldserver.cpp
Auto-merging queryserv/queryserv.cpp
CONFLICT (content): Merge conflict in queryserv/queryserv.cpp
CONFLICT (modify/delete): queryserv/lfguild.cpp deleted in HEAD and modified in upstream/master. Version upstream/master of queryserv/lfguild.cpp left in tree.
Auto-merging loginserver/world_server.h
Auto-merging loginserver/world_server.cpp
Auto-merging loginserver/server_manager.h
Auto-merging loginserver/server_manager.cpp
Auto-merging loginserver/main.cpp
CONFLICT (content): Merge conflict in loginserver/main.cpp
Auto-merging loginserver/login_server.h
Auto-merging loginserver/error_log.h
Auto-merging loginserver/error_log.cpp
Auto-merging loginserver/encryption.cpp
Auto-merging loginserver/database_postgresql.h
Auto-merging loginserver/database_postgresql.cpp
Auto-merging loginserver/database_mysql.h
Auto-merging loginserver/database_mysql.cpp
Auto-merging loginserver/config.cpp
Auto-merging loginserver/client_manager.h
Auto-merging loginserver/client_manager.cpp
Auto-merging loginserver/client.h
Auto-merging loginserver/client.cpp
CONFLICT (content): Merge conflict in loginserver/client.cpp
Auto-merging loginserver/CMakeLists.txt
CONFLICT (content): Merge conflict in loginserver/CMakeLists.txt
Auto-merging eqlaunch/zone_launch.h
Auto-merging eqlaunch/zone_launch.cpp
Auto-merging eqlaunch/eqlaunch.cpp
Auto-merging common/xml_parser.cpp
Auto-merging common/tcp_server.cpp
Auto-merging common/tcp_connection.h
Auto-merging common/tcp_connection.cpp
Auto-merging common/tcp_basic_server.h
Auto-merging common/struct_strategy.cpp
Auto-merging common/string_util.h
Auto-merging common/string_util.cpp
Auto-merging common/spdat.h
Auto-merging common/spdat.cpp
Auto-merging common/skills.h
Auto-merging common/shareddb.h
Auto-merging common/shareddb.cpp
CONFLICT (content): Merge conflict in common/shareddb.cpp
Auto-merging common/servertalk.h
Auto-merging common/ruletypes.h
Auto-merging common/proc_launcher.cpp
Auto-merging common/perl_eqdb_res.cpp
Auto-merging common/perl_eqdb.cpp
CONFLICT (rename/delete): common/patches/underfoot_structs.h deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/underfoot_structs.h left in tree.
CONFLICT (rename/delete): common/patches/underfoot_ops.h deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/underfoot_ops.h left in tree.
CONFLICT (rename/delete): common/patches/underfoot_itemfields.h deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/underfoot_itemfields.h left in tree.
CONFLICT (rename/delete): common/patches/underfoot.h deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/underfoot.h left in tree.
CONFLICT (rename/delete): common/patches/underfoot.cpp deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/underfoot.cpp left in tree.
CONFLICT (rename/delete): common/patches/titanium_structs.h deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/titanium_structs.h left in tree.
CONFLICT (rename/delete): common/patches/titanium_ops.h deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/titanium_ops.h left in tree.
CONFLICT (rename/delete): common/patches/titanium_itemfields.h deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/titanium_itemfields.h left in tree.
CONFLICT (rename/delete): common/patches/titanium.h deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/titanium.h left in tree.
CONFLICT (rename/delete): common/patches/titanium.cpp deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/titanium.cpp left in tree.
CONFLICT (rename/delete): common/patches/sof_structs.h deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/sof_structs.h left in tree.
CONFLICT (rename/delete): common/patches/sof_ops.h deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/sof_ops.h left in tree.
CONFLICT (rename/delete): common/patches/sof_opcode_list.h deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/sof_opcode_list.h left in tree.
CONFLICT (rename/delete): common/patches/sof_itemfields.h deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/sof_itemfields.h left in tree.
CONFLICT (rename/delete): common/patches/sof.h deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/sof.h left in tree.
CONFLICT (rename/delete): common/patches/sof.cpp deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/sof.cpp left in tree.
CONFLICT (rename/delete): common/patches/sod_structs.h deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/sod_structs.h left in tree.
CONFLICT (rename/delete): common/patches/sod_ops.h deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/sod_ops.h left in tree.
CONFLICT (rename/delete): common/patches/sod_itemfields.h deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/sod_itemfields.h left in tree.
CONFLICT (rename/delete): common/patches/sod.cpp deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/sod.cpp left in tree.
CONFLICT (rename/delete): common/patches/rof_structs.h deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/rof_structs.h left in tree.
CONFLICT (rename/delete): common/patches/rof_ops.h deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/rof_ops.h left in tree.
CONFLICT (rename/delete): common/patches/rof_itemfields.h deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/rof_itemfields.h left in tree.
CONFLICT (rename/delete): common/patches/rof.cpp deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/rof.cpp left in tree.
Auto-merging common/patches/patches.cpp
CONFLICT (content): Merge conflict in common/patches/patches.cpp
CONFLICT (rename/delete): common/patches/client62_structs.h deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/client62_structs.h left in tree.
CONFLICT (rename/delete): common/patches/client62_ops.h deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/client62_ops.h left in tree.
CONFLICT (rename/delete): common/patches/client62_itemfields.h deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/client62_itemfields.h left in tree.
CONFLICT (rename/delete): common/patches/client62.h deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/client62.h left in tree.
CONFLICT (rename/delete): common/patches/client62.cpp deleted in HEAD and renamed in upstream/master. Version upstream/master of common/patches/client62.cpp left in tree.
CONFLICT (rename/rename): Rename "common/patches/RoF.h"->"common/patches/Mac.h" in branch "HEAD" rename "common/patches/RoF.h"->"common/patches/rof.h" in "upstream/master"
CONFLICT (rename/rename): Rename "common/patches/SoD.h"->"common/patches/Evolution.h" in branch "HEAD" rename "common/patches/SoD.h"->"common/patches/sod.h" in "upstream/master"
Auto-merging common/mysql_request_row.cpp
Auto-merging common/mysql_request_result.h
Auto-merging common/mysql_request_result.cpp
Auto-merging common/mutex.cpp
Auto-merging common/misc_functions.h
Auto-merging common/misc_functions.cpp
Auto-merging common/logtypes.h
CONFLICT (content): Merge conflict in common/logtypes.h
Auto-merging common/item_struct.h
Auto-merging common/item.h
CONFLICT (content): Merge conflict in common/item.h
Auto-merging common/item.cpp
CONFLICT (content): Merge conflict in common/item.cpp
Auto-merging common/guild_base.h
Auto-merging common/guild_base.cpp
CONFLICT (content): Merge conflict in common/guild_base.cpp
Auto-merging common/eqemu_error.cpp
Auto-merging common/eqemu_config.h
Auto-merging common/eqemu_config.cpp
Auto-merging common/eqdb_res.cpp
Auto-merging common/eqdb.h
Auto-merging common/eqdb.cpp
Auto-merging common/eq_stream_proxy.h
Auto-merging common/eq_stream_proxy.cpp
Auto-merging common/eq_stream_ident.h
Auto-merging common/eq_stream_ident.cpp
Auto-merging common/eq_stream_factory.h
Auto-merging common/eq_stream_factory.cpp
Auto-merging common/eq_stream.h
Auto-merging common/eq_stream.cpp
Auto-merging common/eq_packet_structs.h
CONFLICT (content): Merge conflict in common/eq_packet_structs.h
Auto-merging common/eq_packet.h
Auto-merging common/eq_packet.cpp
CONFLICT (content): Merge conflict in common/eq_packet.cpp
Auto-merging common/eq_constants.h
CONFLICT (content): Merge conflict in common/eq_constants.h
Auto-merging common/emu_tcp_server.h
Auto-merging common/emu_tcp_server.cpp
Auto-merging common/emu_tcp_connection.h
Auto-merging common/emu_tcp_connection.cpp
Auto-merging common/emu_oplist.h
CONFLICT (content): Merge conflict in common/emu_oplist.h
Auto-merging common/database.h
Auto-merging common/database.cpp
CONFLICT (content): Merge conflict in common/database.cpp
Auto-merging common/condition.cpp
Auto-merging common/clientversions.h
CONFLICT (content): Merge conflict in common/clientversions.h
Auto-merging common/base_packet.cpp
Removing common/MaxSkill.cpp
Removing common/EQNetwork.h
Removing common/EQNetwork.cpp
Auto-merging common/CMakeLists.txt
CONFLICT (content): Merge conflict in common/CMakeLists.txt
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Auto-merging CMakeLists.txt
Automatic merge failed; fix conflicts and then commit the result.

Raw Paste Data