maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Resolved a merge conflict.

Browse source
This commit is contained in:
Bojidar Marinov 2015-06-13 14:43:12 +03:00
parent 4e46143499
commit 5a0de04eb7
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
demos/2d/motion/engine.cfg
View file

@ -3,12 +3,9 @@
name="Motion Test"
main_scene="res://motion.scn"
<<<<<<< HEAD
=======
[display]
width=800
height=600
stretch_mode="2d"
stretch_aspect="keep"
>>>>>>> ab99671bb835a5fe24a092ec34afe1ad862ac254