steffo/stack
steffo/stack
1
Fork 0
mirror of https://github.com/Steffo99/stack.git synced 2024-11-29 03:04:19 +00:00
Code Activity

Merge branch 'master' of https://github.com/Steffo99/Stack

Browse source 
Conflicts:
	boom.project.gmx
This commit is contained in:
Steffo 2013-07-17 16:42:31 +02:00
commit 7f11d8c843
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
boom.project.gmx
View file

@ -210,6 +210,7 @@
</objects> </objects>
<objects name="Muri"> <objects name="Muri">
<objects name="Invulnerabili"> <objects name="Invulnerabili">
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<object>objects\o_wall_inv</object> <object>objects\o_wall_inv</object>
<object>objects\o_wall_inv_L_D</object> <object>objects\o_wall_inv_L_D</object>
@ -224,6 +225,8 @@
<object>objects\o_magnet</object> <object>objects\o_magnet</object>
</objects> </objects>
======= =======
>>>>>>> 9cf83a7d47cccf98581ba22ff4c3d1dfddecc355
=======
>>>>>>> 9cf83a7d47cccf98581ba22ff4c3d1dfddecc355 >>>>>>> 9cf83a7d47cccf98581ba22ff4c3d1dfddecc355
<objects name="Go To"> <objects name="Go To">
<object>objects\o_move_freeplay_levels</object> <object>objects\o_move_freeplay_levels</object>
@ -236,13 +239,19 @@
<object>objects\o_move_sandbox</object> <object>objects\o_move_sandbox</object>
</objects> </objects>
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
======= =======
=======
>>>>>>> 9cf83a7d47cccf98581ba22ff4c3d1dfddecc355
<object>objects\o_wall_inv</object> <object>objects\o_wall_inv</object>
<object>objects\o_wall_inv_L_D</object> <object>objects\o_wall_inv_L_D</object>
<object>objects\o_wall_inv_L_U</object> <object>objects\o_wall_inv_L_U</object>
<object>objects\o_wall_inv_R_U</object> <object>objects\o_wall_inv_R_U</object>
<object>objects\o_wall_inv_R_D</object> <object>objects\o_wall_inv_R_D</object>
<object>objects\o_wall_inv_classic</object> <object>objects\o_wall_inv_classic</object>
<<<<<<< HEAD
>>>>>>> 9cf83a7d47cccf98581ba22ff4c3d1dfddecc355
=======
>>>>>>> 9cf83a7d47cccf98581ba22ff4c3d1dfddecc355 >>>>>>> 9cf83a7d47cccf98581ba22ff4c3d1dfddecc355
</objects> </objects>
<objects name="Piazzabili"> <objects name="Piazzabili">
@ -250,7 +259,10 @@
</objects> </objects>
</objects> </objects>
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
======= =======
=======
>>>>>>> 9cf83a7d47cccf98581ba22ff4c3d1dfddecc355
</objects> </objects>
<objects name="Pezzi"> <objects name="Pezzi">
<object>objects\o_wall_inv_totem</object> <object>objects\o_wall_inv_totem</object>