? merger
RCS file: /home/cvspsrv/cvsroot/games/asc/data/Makefile.in,v
retrieving revision 1.30
retrieving revision 1.31
Merging differences between 1.30 and 1.31 into Makefile.in
U palette.map
RCS file: /home/cvspsrv/cvsroot/games/asc/data/dialog/Makefile.in,v
retrieving revision 1.14
retrieving revision 1.15
Merging differences between 1.14 and 1.15 into Makefile.in
RCS file: /home/cvspsrv/cvsroot/games/asc/data/icons/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
Merging differences between 1.4 and 1.5 into Makefile.in
RCS file: /home/cvspsrv/cvsroot/games/asc/data/icons/newmultiplayergame.ascgui,v
retrieving revision 1.2
retrieving revision 1.3
Merging differences between 1.2 and 1.3 into newmultiplayergame.ascgui
RCS file: /home/cvspsrv/cvsroot/games/asc/data/music/Makefile.in,v
retrieving revision 1.14
retrieving revision 1.15
Merging differences between 1.14 and 1.15 into Makefile.in
RCS file: /home/cvspsrv/cvsroot/games/asc/data/sounds/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
Merging differences between 1.4 and 1.5 into Makefile.in
RCS file: /home/cvspsrv/cvsroot/games/asc/data/trrobj/objects/buildable/ob_0002railroad.asctxt,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into ob_0002railroad.asctxt
RCS file: /home/cvspsrv/cvsroot/games/asc/data/trrobj/objects/buildable/ob_0030pipeline2.asctxt,v
retrieving revision 1.3
retrieving revision 1.4
Merging differences between 1.3 and 1.4 into ob_0030pipeline2.asctxt
RCS file: /home/cvspsrv/cvsroot/games/asc/data/trrobj/objects/buildable/ob_0991railroadsmall.asctxt,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into ob_0991railroadsmall.asctxt
RCS file: /home/cvspsrv/cvsroot/games/asc/data/trrobj/objects/buildable/ob_0992armorrailroad.asctxt,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into ob_0992armorrailroad.asctxt
RCS file: /home/cvspsrv/cvsroot/games/asc/data/trrobj/objects/buildable/ob_0995big_railroad_bridge.asctxt,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into ob_0995big_railroad_bridge.asctxt
RCS file: /home/cvspsrv/cvsroot/games/asc/data/trrobj/objects/buildable/ob_0996strong_pipeline.asctxt,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into ob_0996strong_pipeline.asctxt
RCS file: /home/cvspsrv/cvsroot/games/asc/data/trrobj/objects/buildable/ob_2152_field.asctxt,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into ob_2152_field.asctxt
RCS file: /home/cvspsrv/cvsroot/games/asc/data/trrobj/objects/buildable/obj_crystals_1.asctxt,v
retrieving revision 1.2
retrieving revision 1.3
Merging differences between 1.2 and 1.3 into obj_crystals_1.asctxt
U trrobj/objects/buildable/obj_mushrooms_1.asctxt
U trrobj/objects/buildable/obj_mushrooms_1.png
U trrobj/objects/buildable/obj_mushrooms_1_adapter.asctxt
RCS file: /home/cvspsrv/cvsroot/games/asc/data/trrobj/objects/landscape/trr_block_1.asctxt,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into trr_block_1.asctxt
trrobj/objects/landscape/trr_block_1.asctxt already contains the differences between 1.1 and 1.2
U trrobj/terrain/trr_grassland_15.png
U trrobj/terrain/trr_grassland_15_fs.png
U trrobj/terrain/trr_grassland_15_hr.png
U trrobj/terrain/trr_grassland_15_lr.png
U trrobj/terrain/trr_grassland_16.png
U trrobj/terrain/trr_grassland_16_fs.png
U trrobj/terrain/trr_grassland_16_hr.png
U trrobj/terrain/trr_grassland_16_lr.png
U trrobj/terrain/trr_grassland_17.png
U trrobj/terrain/trr_grassland_17_fs.png
U trrobj/terrain/trr_grassland_17_hr.png
U trrobj/terrain/trr_grassland_17_lr.png
RCS file: /home/cvspsrv/cvsroot/games/asc/data/unitsets/mk1/mk1-parent/_asc-mk1-info.txt,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into _asc-mk1-info.txt
RCS file: /home/cvspsrv/cvsroot/games/asc/data/unitsets/mk1/mk1-parent/_parent_400_weapon.asctxt,v
retrieving revision 1.2
retrieving revision 1.5
Merging differences between 1.2 and 1.5 into _parent_400_weapon.asctxt
RCS file: /home/cvspsrv/cvsroot/games/asc/data/unitsets/mk1/mk1-parent/_parent_401_transport.asctxt,v
retrieving revision 1.1
retrieving revision 1.5
Merging differences between 1.1 and 1.5 into _parent_401_transport.asctxt
RCS file: /home/cvspsrv/cvsroot/games/asc/data/unitsets/mk1/mk1-parent/_parent_424_rocket_weapon.asctxt,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into _parent_424_rocket_weapon.asctxt
RCS file: /home/cvspsrv/cvsroot/games/asc/data/unitsets/mk1/mk1-parent/_parent_425_drone_weapon.asctxt,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into _parent_425_drone_weapon.asctxt
RCS file: /home/cvspsrv/cvsroot/games/asc/data/unitsets/mk1/mk1-parent/a01_270_fighter_light.asctxt,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into a01_270_fighter_light.asctxt
RCS file: /home/cvspsrv/cvsroot/games/asc/data/unitsets/mk1/mk1-parent/ad08_222_samturret.asctxt,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into ad08_222_samturret.asctxt
RCS file: /home/cvspsrv/cvsroot/games/asc/data/unitsets/mk1/mk1-parent/i06_206_diver.asctxt,v
retrieving revision 1.1
retrieving revision 1.4
Merging differences between 1.1 and 1.4 into i06_206_diver.asctxt
RCS file: /home/cvspsrv/cvsroot/games/asc/data/unitsets/mk1/mk1-parent/i11_211_def_mech.asctxt,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into i11_211_def_mech.asctxt
RCS file: /home/cvspsrv/cvsroot/games/asc/data/unitsets/mk1/mk1-parent/i13_213_dive_mech.asctxt,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into i13_213_dive_mech.asctxt
RCS file: /home/cvspsrv/cvsroot/games/asc/data/unitsets/mk1/mk1-parent/j_306_mech.asctxt,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into j_306_mech.asctxt
RCS file: /home/cvspsrv/cvsroot/games/asc/data/unitsets/mk1/mk1-parent/j_307_vehicle.asctxt,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into j_307_vehicle.asctxt
RCS file: /home/cvspsrv/cvsroot/games/asc/data/unitsets/mk1/mk1-parent/j_308_device.asctxt,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into j_308_device.asctxt
RCS file: /home/cvspsrv/cvsroot/games/asc/data/unitsets/mk1/mk1-parent/j_311_heli.asctxt,v
retrieving revision 1.2
retrieving revision 1.3
Merging differences between 1.2 and 1.3 into j_311_heli.asctxt
RCS file: /home/cvspsrv/cvsroot/games/asc/data/unitsets/mk1/mk1-parent/j_313_sat.asctxt,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into j_313_sat.asctxt
RCS file: /home/cvspsrv/cvsroot/games/asc/data/unitsets/mk1/mk1-parent/mk1-history.txt,v
retrieving revision 1.5
retrieving revision 1.7
Merging differences between 1.5 and 1.7 into mk1-history.txt
RCS file: /home/cvspsrv/cvsroot/games/asc/data/unitsets/mk1/mk1-parent/t06_295_tank_defence.asctxt,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into t06_295_tank_defence.asctxt
RCS file: /home/cvspsrv/cvsroot/games/asc/data/unitsets/mk1/mk1-parent/w01_331_fastrecon.asctxt,v
retrieving revision 1.2
retrieving revision 1.3
Merging differences between 1.2 and 1.3 into w01_331_fastrecon.asctxt
U unitsets/mk1/mk1-shtu/mk1s_mrsm.asctxt
U unitsets/mk1/mk1-shtu/mk1s_mrsm.pcx
U unitsets/mk1/mk1-shtu/mk1s_mrsm_pbp_adapter.asctxt
U unitsets/mk1/mk1-shtu/mk1s_mrsm_pbp_tech.asctxt
