summaryrefslogtreecommitdiff
path: root/editor/settings_config_dialog.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-07-01 13:02:36 -0300
committerGitHub <noreply@github.com>2017-07-01 13:02:36 -0300
commit2ee86c773a3f551e81d0353bae841fdb2eba1c74 (patch)
treee641c0bb2759957193e06f4e83fe9e45a5209ab9 /editor/settings_config_dialog.cpp
parent8e8e4b30e51cfc063daa57e031b7f427703e0eb8 (diff)
parenta808f53020aa710ff81392e2349b8a39c55d2717 (diff)
Merge pull request #9461 from godotengine/revert-9454-9409-fix-collisionshape2d-return
Revert "Fix Tileset/tilemap issues related to my adding of one-way collisions to them"
Diffstat (limited to 'editor/settings_config_dialog.cpp')
0 files changed, 0 insertions, 0 deletions