diff options
| author | Kostadin Damyanov <maxmight@gmail.com> | 2015-06-26 21:35:47 +0300 |
|---|---|---|
| committer | Kostadin Damyanov <maxmight@gmail.com> | 2015-06-26 21:35:47 +0300 |
| commit | e0e54ea7d456c0fabd8f3f9b2667a69ff520f852 (patch) | |
| tree | 9ce4e0b6db40ac2ab07b8582e57282fe63130165 /demos/2d/motion/engine.cfg | |
| parent | f61eb5fd8e13642c82364f8ee66a0f6c791a4511 (diff) | |
| parent | a67486a39ee629acac068a6d014015944cf83bb3 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'demos/2d/motion/engine.cfg')
| -rw-r--r-- | demos/2d/motion/engine.cfg | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/demos/2d/motion/engine.cfg b/demos/2d/motion/engine.cfg index 29c4d0da20..261111904c 100644 --- a/demos/2d/motion/engine.cfg +++ b/demos/2d/motion/engine.cfg @@ -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 |