Auto-merging (24726, 24829) /local to /trunk (base /trunk:24828).
Merging back to mirror source ..
U xenon_base/xenon_builder0.bat
U xenon_base/xenon_builder1.bat
U xenon_base/xenon_builder2.bat
U xenon_base/menus/strogg_quickchat.radialmenu
U xenon_base/menus/gdf_quickchat.radialmenu
U xenon_base/guis/xenon/guimain.gui
A xenon_base/guis/game/quickchat.gui
U xenon_base/guis/game/limbo.gui
U xenon_base/xenon_tools/xenon_deploy_config.bat
U base/imposters/generate_pine.imp
U base/imposters/imposters.imp
U base/stuff/quarry/quarry_deadgrass_mask.tga
U base/stuff/quarry/quarry.sg
A base/stuff/foliage/temperate/i_weeds06.lwo
U base/stuff/foliage/temperate/island_stuff.tga
U base/stuff/quarry.stuff
U base/atmosphere/editor.atm
U base/models/mapobjects/island/beacon/beacon_base.lwo
U base/models/mapobjects/island/beacon/raise.md5anim
U base/models/mapobjects/island/beacon/beacon_base_d.tga
U base/models/mapobjects/island/beacon/idle_loop.md5anim
U base/models/mapobjects/island/beacon/beacon_base_local.tga
U base/models/mapobjects/island/beacon/beacon_base_s.tga
U base/models/mapobjects/quarry/crashrock/crashrocks.lwo
U base/models/mapobjects/quarry/scarabrubble/scarab_rubble01.lwo
U base/models/mapobjects/quarry/scarabrubble/scarab_rubble02.lwo
U base/models/mapobjects/quarry/scarabrubble/scarab_rubble03.lwo
U base/models/mapobjects/quarry/scarabrubble/scarab_rubble04.lwo
U base/models/mapobjects/quarry/scarabrubble/scarab_rubble05.lwo
U base/models/mapobjects/quarry/scarabrubble/scarab_rubble06.lwo
U base/models/mapobjects/quarry/scarabrubble/scarab_rubble07.lwo
U base/models/mapobjects/quarry/scarabrubble/scarab_rubble08.lwo
U base/models/mapobjects/crash_barriers/cb_island_01.lwo
U base/models/vegetation/trees/n_trees_quary/aut_tree_quary_03_red_imposter.tga
U base/models/vegetation/trees/n_trees_quary/aut_branch_04_d.tga
A base/models/vegetation/trees/n_trees_quary/aut_tree_quary_03_green_tall.lwo
U base/models/vegetation/trees/n_trees_quary/aut_tree_quary_03.lwo
U base/models/vegetation/trees/n_trees_quary/aut_tree_quary_03_green_imposter.tga
U base/models/vegetation/trees/n_trees_quary/aut_tree_quary_03_dead.lwo
U base/models/vegetation/trees/n_trees_quary/aut_branch_04_red_d.tga
U base/models/vegetation/trees/n_trees_quary/aut_tree_quary_03_red.lwo
U base/models/vegetation/trees/n_trees_quary/aut_tree_quary_03_imposter.tga
U base/models/vegetation/trees/n_trees_quary/aut_branch_04_green_d.tga
U base/models/vegetation/trees/n_trees_quary/aut_tree_quary_03_green.lwo
A base/models/vegetation/trees/n_trees_island/pine_tree_01_imposter.tga
A base/models/vegetation/trees/n_trees_island/pine_tree_02_imposter.tga
D base/models/vegetation/trees/n_trees_island/pine_tree_01.tga
D base/models/vegetation/trees/n_trees_island/pine_tree_02.tga
U base/heightmaps/quarry.tga
A base/textures/megagen/island_nerve/textures/island_red_mulch_02_mask.tga
A base/textures/megagen/island_nerve/textures/island_acadia_stone04_090_mask.tga
A base/textures/megagen/island_nerve/textures/island_acadia_stone05_000_d.tga
A base/textures/megagen/island_nerve/textures/island_acadia_stone04_270_local.tga
A base/textures/megagen/island_nerve/textures/island_acadia_stone04_180_mask.tga
U base/textures/megagen/island_nerve/textures/island_local.tga
U base/textures/megagen/island_nerve/textures/island_beach_grass_01_d.tga
U base/textures/megagen/island_nerve/textures/island_red_mulch_d.tga
U base/textures/megagen/island_nerve/textures/track_beachsand02_d.tga
A base/textures/megagen/island_nerve/textures/island_acadia_stone04_000_mask.tga
A base/textures/megagen/island_nerve/textures/island_acadia_stone05_000_local.tga
A base/textures/megagen/island_nerve/textures/island_grass01_dark_weeds_d.tga
A base/textures/megagen/island_nerve/textures/island_acadia_stone04_270_mask.tga
A base/textures/megagen/island_nerve/textures/island_acadia_stone05_d.tga
A base/textures/megagen/island_nerve/textures/island_grass01_dark_weeds_mask.tga
U base/textures/megagen/island_nerve/textures/island_sand_prints_01_d.tga
U base/textures/megagen/island_nerve/textures/island_sand_01_d.tga
U base/textures/megagen/island_nerve/textures/track_foot_beachsand01_d.tga
A base/textures/megagen/island_nerve/textures/island_acadia_stone04_80_local.tga
U base/textures/megagen/island_nerve/textures/island_sand_tracks_01_d.tga
A base/textures/megagen/island_nerve/textures/island_red_mulch_02_d.tga
A base/textures/megagen/island_nerve/textures/island_sand_tracks_01_mask.tga
A base/textures/megagen/island_nerve/textures/island_acadia_stone05_000_mask.tga
A base/textures/megagen/island_nerve/textures/island_acadia_stone04_090_local.tga
A base/textures/megagen/island_nerve/textures/island_acadia_stone05_local.tga
A base/textures/megagen/island_nerve/textures/island_acadia_stone05_mask.tga
U base/textures/megagen/island_nerve/textures/track_beachsand01_d.tga
A base/textures/megagen/island_nerve/textures/island_acadia_stone04_000_local.tga
D base/textures/megagen/island_nerve/textures/beach_grassy_sand03_d.tga
D base/textures/megagen/island_nerve/textures/beach_grassy_sand03_h.tga
D base/textures/megagen/island_nerve/textures/beach_grassy_sand03_local.tga
D base/textures/megagen/island_nerve/textures/beach_sand01_d.tga
D base/textures/megagen/island_nerve/textures/beach_sand01_h.tga
D base/textures/megagen/island_nerve/textures/beach_sand01_local.tga
D base/textures/megagen/island_nerve/textures/beach_sand_wavy_h.tga
D base/textures/megagen/island_nerve/textures/beach_sand_wavy_local.tga
D base/textures/megagen/island_nerve/textures/dirt_01_d.tga
D base/textures/megagen/island_nerve/textures/dirt_01_h.tga
D base/textures/megagen/island_nerve/textures/dirt_01_local.tga
D base/textures/megagen/island_nerve/textures/dirt_02_d.tga
D base/textures/megagen/island_nerve/textures/dirt_02_dark_d.tga
D base/textures/megagen/island_nerve/textures/dirt_02_h.tga
D base/textures/megagen/island_nerve/textures/dirt_02_local.tga
D base/textures/megagen/island_nerve/textures/dirt_02_mask.tga
D base/textures/megagen/island_nerve/textures/grass01_d.tga
D base/textures/megagen/island_nerve/textures/grass01_dark_d.tga
D base/textures/megagen/island_nerve/textures/grass01_h.tga
D base/textures/megagen/island_nerve/textures/grass01_local.tga
D base/textures/megagen/island_nerve/textures/grass02_d.tga
D base/textures/megagen/island_nerve/textures/grass02_h.tga
D base/textures/megagen/island_nerve/textures/grass02_local.tga
D base/textures/megagen/island_nerve/textures/grass02_mask.tga
D base/textures/megagen/island_nerve/textures/grass_patchy01_d.tga
D base/textures/megagen/island_nerve/textures/grass_patchy01_h.tga
D base/textures/megagen/island_nerve/textures/grass_patchy01_local.tga
D base/textures/megagen/island_nerve/textures/grass_patchy01_mask.tga
D base/textures/megagen/island_nerve/textures/grass_patchy02_d.tga
D base/textures/megagen/island_nerve/textures/grass_patchy02_h.tga
D base/textures/megagen/island_nerve/textures/grass_patchy02_local.tga
D base/textures/megagen/island_nerve/textures/ground_small_rocks_1_d.tga
D base/textures/megagen/island_nerve/textures/ground_small_rocks_1_height.tga
D base/textures/megagen/island_nerve/textures/ground_small_rocks_1_local.tga
D base/textures/megagen/island_nerve/textures/mud_stoney_d.tga
D base/textures/megagen/island_nerve/textures/mud_stoney_local.tga
D base/textures/megagen/island_nerve/textures/mud_stoney_mask.tga
D base/textures/megagen/island_nerve/textures/mud_trampled_grass_d.tga
D base/textures/megagen/island_nerve/textures/mud_trampled_grass_local.tga
D base/textures/megagen/island_nerve/textures/mud_trampled_grass_mask.tga
D base/textures/megagen/island_nerve/textures/road_dirt_d.tga
D base/textures/megagen/island_nerve/textures/road_dirt_h.tga
D base/textures/megagen/island_nerve/textures/road_dirt_local.tga
D base/textures/megagen/island_nerve/textures/road_dirt_mask.tga
D base/textures/megagen/island_nerve/textures/rock01_d.tga
D base/textures/megagen/island_nerve/textures/rock01_h.tga
D base/textures/megagen/island_nerve/textures/rock01_local.tga
D base/textures/megagen/island_nerve/textures/rock01_mask.tga
D base/textures/megagen/island_nerve/textures/rock02_d.tga
D base/textures/megagen/island_nerve/textures/rock02_grass_d.tga
D base/textures/megagen/island_nerve/textures/rock02_grass_local.tga
D base/textures/megagen/island_nerve/textures/rock02_h.tga
D base/textures/megagen/island_nerve/textures/rock02_local.tga
D base/textures/megagen/island_nerve/textures/rock02_mask.tga
D base/textures/megagen/island_nerve/textures/underwater_sand01_d.tga
D base/textures/megagen/island_nerve/textures/underwater_sand01_h.tga
D base/textures/megagen/island_nerve/textures/underwater_sand01_local.tga
A base/textures/megagen/island_nerve/masks/island_cliff_180.tga
A base/textures/megagen/island_nerve/masks/island_angle_180.tga
A base/textures/megagen/island_nerve/masks/root_wear_mask.tga
U base/textures/megagen/island_nerve/masks/grass_dist_mask04.tga
U base/textures/megagen/island_nerve/masks/grass_dist_mask05.tga
U base/textures/megagen/island_nerve/masks/beach_sand_over_road_mask01.tga
U base/textures/megagen/island_nerve/masks/mask03.tga
A base/textures/megagen/island_nerve/masks/island_angle_270.tga
A base/textures/megagen/island_nerve/masks/island_angle_090.tga
U base/textures/megagen/island_nerve/masks/tarmac_mask.tga
A base/textures/megagen/island_nerve/masks/island_flow2.tga
U base/textures/megagen/island_nerve/masks/beach_sand_mask01.tga
A base/textures/megagen/island_nerve/masks/island_cliff_000.tga
A base/textures/megagen/island_nerve/masks/island_angle_000.tga
D base/textures/megagen/island_nerve/base_dirt.tga
D base/textures/megagen/island_nerve/base_dirt_mask.tga
D base/textures/megagen/island_nerve/basic_rock_mask.tga
D base/textures/megagen/island_nerve/beach_pebbles01.tga
D base/textures/megagen/island_nerve/beach_pebbles01_local.tga
D base/textures/megagen/island_nerve/bryk_sand.tga
D base/textures/megagen/island_nerve/bryk_sand_dark.tga
D base/textures/megagen/island_nerve/bryk_sand_under.tga
D base/textures/megagen/island_nerve/cliff_dirt_mask.tga
D base/textures/megagen/island_nerve/cliffs_dist.tga
D base/textures/megagen/island_nerve/dark_dirt1.tga
D base/textures/megagen/island_nerve/deep_wetsand_dist.tga
D base/textures/megagen/island_nerve/dirt1.tga
D base/textures/megagen/island_nerve/dirt2.tga
D base/textures/megagen/island_nerve/dirt3.tga
D base/textures/megagen/island_nerve/dirt4.tga
D base/textures/megagen/island_nerve/dirt_grass1.tga
D base/textures/megagen/island_nerve/dirt_road1_d.tga
D base/textures/megagen/island_nerve/dirt_road1_local.tga
D base/textures/megagen/island_nerve/dirt_road1_mask.tga
D base/textures/megagen/island_nerve/dist_rock_h.tga
D base/textures/megagen/island_nerve/dist_rock_h2.tga
D base/textures/megagen/island_nerve/dist_rock_h3.tga
D base/textures/megagen/island_nerve/edge_dirt.tga
D base/textures/megagen/island_nerve/edge_dirt_mask.tga
D base/textures/megagen/island_nerve/gdf_dirt.tga
D base/textures/megagen/island_nerve/gdf_dirt_h.tga
D base/textures/megagen/island_nerve/gdf_dirt_local.tga
D base/textures/megagen/island_nerve/gdf_dirt_mask.tga
D base/textures/megagen/island_nerve/grass1.tga
D base/textures/megagen/island_nerve/grass2.tga
D base/textures/megagen/island_nerve/grass3.tga
D base/textures/megagen/island_nerve/grass4.tga
D base/textures/megagen/island_nerve/grass5.tga
D base/textures/megagen/island_nerve/grass6.tga
D base/textures/megagen/island_nerve/grass6_local.tga
D base/textures/megagen/island_nerve/grass_dist.tga
D base/textures/megagen/island_nerve/grass_mask.tga
D base/textures/megagen/island_nerve/island_wm_local.tga
D base/textures/megagen/island_nerve/largerock_mask.tga
D base/textures/megagen/island_nerve/light_sand_mask.tga
D base/textures/megagen/island_nerve/road_dist.tga
D base/textures/megagen/island_nerve/road_tarmack_sand_d.tga
D base/textures/megagen/island_nerve/road_tarmack_sand_local.tga
D base/textures/megagen/island_nerve/road_tarmack_sand_mask.tga
D base/textures/megagen/island_nerve/rock10.tga
D base/textures/megagen/island_nerve/rock11_d.tga
D base/textures/megagen/island_nerve/rock12_d.tga
D base/textures/megagen/island_nerve/rock12_d_h.tga
D base/textures/megagen/island_nerve/rock12_d_h2.tga
D base/textures/megagen/island_nerve/rock1_bump.tga
D base/textures/megagen/island_nerve/rock1_d.tga
D base/textures/megagen/island_nerve/rock1_dis.tga
D base/textures/megagen/island_nerve/rock2.tga
D base/textures/megagen/island_nerve/rock3.tga
D base/textures/megagen/island_nerve/rock4.tga
D base/textures/megagen/island_nerve/rock5.tga
D base/textures/megagen/island_nerve/rock6.tga
D base/textures/megagen/island_nerve/rock7.tga
D base/textures/megagen/island_nerve/rock8.tga
D base/textures/megagen/island_nerve/rock9.tga
D base/textures/megagen/island_nerve/rock9_dark.tga
D base/textures/megagen/island_nerve/rock_wet_dis.tga
D base/textures/megagen/island_nerve/rocktile1_local.tga
D base/textures/megagen/island_nerve/sand1.tga
D base/textures/megagen/island_nerve/sand2.tga
D base/textures/megagen/island_nerve/sand3.tga
D base/textures/megagen/island_nerve/sand4.tga
D base/textures/megagen/island_nerve/sand5.tga
D base/textures/megagen/island_nerve/sand5_wet.tga
D base/textures/megagen/island_nerve/sand_wet_dis.tga
D base/textures/megagen/island_nerve/sandy_grass_mask.tga
D base/textures/megagen/island_nerve/sandy_rocks1.tga
D base/textures/megagen/island_nerve/sandy_rocks1_h.tga
D base/textures/megagen/island_nerve/sandy_rocks1_local.tga
D base/textures/megagen/island_nerve/sandy_rocks2.tga
D base/textures/megagen/island_nerve/sandy_rocks2_local.tga
D base/textures/megagen/island_nerve/sandy_rocks3.tga
D base/textures/megagen/island_nerve/strogg_rock_mask.tga
D base/textures/megagen/island_nerve/transrock1.tga
D base/textures/megagen/island_nerve/underwater_rocky_dirt_dist.tga
D base/textures/megagen/island_nerve/underwater_sand_dist.tga
D base/textures/megagen/island_nerve/water_rock_mask.tga
U base/def/maps/quarry_paths.def
U base/def/weapons/lightningpistol.def
U base/def/players/player.def
U base/maps/island.world
U base/maps/quarry.world
U base/maps/island.stm
U base/maps/quarry.entities
U base/maps/references/island/gdf_base_boat_launch.world
U base/maps/references/island/checkpoint_compound.world
U base/maps/references/island/keycard_bunker.world
U base/maps/references/quarry/rail_yard_gates.world
U base/maps/references/quarry/small_building_2.world
U base/maps/references/quarry/garage.world
U base/maps/references/quarry/storage_area.world
U base/maps/references/quarry/office_building2.world
A base/maps/references/quarry/tank2.world
U base/maps/references/quarry/nowhere_gate.world
U base/maps/references/quarry/office_building.world
U base/maps/island.entities
U base/maps/island.sft
A base/sounds/weapons/railgun/idle_hum_01.wav
A base/sounds/weapons/railgun/idle_hum_02.wav
A base/sounds/weapons/railgun/idle_hum_01a.wav
A base/sounds/weapons/lightningpistol/raise_01.wav
U base/sounds/footsteps.sndshd
U base/sounds/railgun.sndshd
U base/sounds/lightningpistol.sndshd
U base/sounds/players/gdf/movement/dive.wav
U base/sounds/players/gdf/movement/prone_to_stand_local.wav
U base/sounds/players/gdf/movement/prone_to_crouch.wav
U base/sounds/players/gdf/movement/crouch_to_stand_local.wav
U base/sounds/players/gdf/movement/crouch_to_prone.wav
U base/sounds/players/gdf/movement/stand_to_crouch_local.wav
U base/sounds/players/gdf/movement/stand_to_prone_local.wav
U base/sounds/players/gdf/movement/shuffle.wav
U base/sounds/players/gdf/movement/change_weapon.wav
U base/sounds/players/gdf/movement/dive_local.wav
U base/sounds/players/gdf/movement/prone_to_crouch_local.wav
U base/sounds/players/gdf/movement/crouch_to_prone_local.wav
U base/sounds/players/gdf/movement/run.wav
U base/sounds/players/gdf/movement/shuffle_local.wav
U base/sounds/players/gdf/movement/crawl.wav
U base/sounds/players/gdf/movement/run_local.wav
U base/sounds/players/gdf/movement/prone_to_stand.wav
U base/sounds/players/gdf/movement/crouch_to_stand.wav
U base/sounds/players/gdf/movement/stand_to_crouch.wav
U base/sounds/players/gdf/movement/stand_to_prone.wav
U base/sounds/players/gdf/movement/crawl_local.wav
A base/sounds/players/footsteps_strogg/metal
A base/sounds/players/footsteps_strogg/metal/fs2_01.wav
A base/sounds/players/footsteps_strogg/metal/fs2_02.wav
A base/sounds/players/footsteps_strogg/metal/fs2_03.wav
A base/sounds/players/footsteps_strogg/metal/fs2_04.wav
A base/sounds/players/footsteps_strogg/metal/fs2_05.wav
A base/sounds/players/footsteps_strogg/metal/fs2_06.wav
A base/sounds/players/footsteps_strogg/metal/fs2_07.wav
A base/sounds/players/footsteps_strogg/metal/fs_01.wav
A base/sounds/players/footsteps_strogg/metal/fs_10.wav
A base/sounds/players/footsteps_strogg/metal/fs_02.wav
A base/sounds/players/footsteps_strogg/metal/fs_03.wav
A base/sounds/players/footsteps_strogg/metal/fs_04.wav
A base/sounds/players/footsteps_strogg/metal/fs_05.wav
A base/sounds/players/footsteps_strogg/metal/fs_06.wav
A base/sounds/players/footsteps_strogg/metal/fs_07.wav
A base/sounds/players/footsteps_strogg/metal/fs_08.wav
A base/sounds/players/footsteps_strogg/metal/fs_09.wav
A base/sounds/players/footsteps_strogg/dirt
A base/sounds/players/footsteps_strogg/dirt/dirt2_01.wav
A base/sounds/players/footsteps_strogg/dirt/dirt2_02.wav
A base/sounds/players/footsteps_strogg/dirt/dirt2_03.wav
A base/sounds/players/footsteps_strogg/dirt/dirt2_04.wav
A base/sounds/players/footsteps_strogg/dirt/dirt2_05.wav
A base/sounds/players/footsteps_strogg/clothing/moveloop_01_local.wav
A base/sounds/players/footsteps_strogg/clothing/moveloop_02_local.wav
A base/sounds/players/footsteps_strogg/clothing/moveloop_01.wav
A base/sounds/players/footsteps_strogg/clothing/moveloop_02.wav
U base/materials/vegetation/trees/n_trees_quary.mtr
U base/materials/imposters.mtr
U base/materials/n_island.mtr
A base/megagen/stamps/quarry_road_road.stamp
A base/megagen/stamps/island/island_road.megastamp
D base/megagen/stamps/island/broken_road1.megastamp
D base/megagen/stamps/island/cliffs.megastamp
D base/megagen/stamps/island/island_terrain.megastamp
D base/megagen/stamps/island/pebbles.megastamp
A base/megagen/stamps/quarry_rocks.stamp
New merge ticket: 7a1976e8-abf8-0310-b7e3-ac9286b595d4:/local:24829
New merge ticket: a1c85193-1041-4674-a9d7-73b371b96fd9:/local:2263
Merge conflict during commit: MERGE request failed on '/svn/etqw_media/trunk':
Conflict at '/trunk'
Please sync mirrored path /trunk first.