From b8b3b0ff57423acf0b1a16a5a2c4680f742e4004 Mon Sep 17 00:00:00 2001 From: Bojidar Marinov Date: Sat, 13 Jun 2015 14:43:12 +0300 Subject: [PATCH 1/2] Resolved a merge conflict. --- 2d/motion/engine.cfg | 3 --- 1 file changed, 3 deletions(-) diff --git a/2d/motion/engine.cfg b/2d/motion/engine.cfg index 29c4d0da..26111190 100644 --- a/2d/motion/engine.cfg +++ b/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 From 2508fb483df5f3a42bcdcf7d698982abe146f135 Mon Sep 17 00:00:00 2001 From: Bojidar Marinov Date: Sat, 13 Jun 2015 14:47:22 +0300 Subject: [PATCH 2/2] Delete .fscache from fog_of_war demo, closes #2079. --- 2d/fog_of_war/.fscache | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 2d/fog_of_war/.fscache diff --git a/2d/fog_of_war/.fscache b/2d/fog_of_war/.fscache deleted file mode 100644 index ba5e3995..00000000 --- a/2d/fog_of_war/.fscache +++ /dev/null @@ -1,11 +0,0 @@ -::res://::1422910453 -floor.png::ImageTexture::1422910453:: -fog.gd::GDScript::1422910025:: -fog.png::ImageTexture::1422908128:: -fog.scn::PackedScene::1422909435:: -fog.xml::TileSet::1422909324:: -icon.png::ImageTexture::1422811193:: -tile_edit.scn::PackedScene::1422909313:: -troll.gd::GDScript::1422909940:: -troll.png::ImageTexture::1418669358:: -troll.scn::PackedScene::1418669358::