diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-06-06 11:09:00 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-06-06 11:09:00 -0300 |
| commit | 954256268afe89b648d356ee0b296a9e97a07373 (patch) | |
| tree | 36c42fb01f05d26bbae438d470676c9487b47a04 /demos/2d/motion/engine.cfg | |
| parent | 0e1510214a7585d5446f06344468ab52298cfa81 (diff) | |
| parent | ab99671bb835a5fe24a092ec34afe1ad862ac254 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
demos/2d/motion/engine.cfg
Diffstat (limited to 'demos/2d/motion/engine.cfg')
| -rw-r--r-- | demos/2d/motion/engine.cfg | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/demos/2d/motion/engine.cfg b/demos/2d/motion/engine.cfg index cf16105b1c..29c4d0da20 100644 --- a/demos/2d/motion/engine.cfg +++ b/demos/2d/motion/engine.cfg @@ -3,3 +3,12 @@ name="Motion Test" main_scene="res://motion.scn" +<<<<<<< HEAD +======= +[display] + +width=800 +height=600 +stretch_mode="2d" +stretch_aspect="keep" +>>>>>>> ab99671bb835a5fe24a092ec34afe1ad862ac254 |