This was SVN commit r8765.

This commit is contained in:
Matthijs de Rijk 2010-12-02 23:29:12 +00:00
parent a7a858b9c0
commit 88efdd5cbb

View File

@ -1,4 +1,3 @@
<<<<<<< .mine
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
@ -29,21 +28,4 @@
<material>player_trans.xml</material>
</actor>=======
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant frequency="100" name="Base">
<mesh>structural/hele_tric.dae</mesh>
<props>
<prop actor="props/structures/hellenes/trireme_cor_mast.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/trireme_cor_oars.xml" attachpoint="root"/>
</props>
<texture>structural/plac_hele.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
>>>>>>> .r7157