Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-28 20:24:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix broken merge

Browse source
This commit is contained in:
Juan Linietsky 2015-12-12 10:21:22 -03:00
parent a2d817405e
commit e19f176765
2 changed files with 0 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tools/editor/script_editor_debugger.cpp
View file

@ -1161,23 +1161,10 @@ void ScriptEditorDebugger:: _error_stack_selected(int p_idx){
}
<<<<<<< HEAD
void ScriptEditorDebugger::set_hide_on_stop(bool p_hide) {
hide_on_stop=p_hide;
}
=======
void ScriptEditorDebugger::set_always_visible(bool p_visible) {
always_visible=p_visible;
if (p_visible)
show();
else
hide();
}
>>>>>>> c3db5d951c1ee938a0c789c78a9bb8045ef8605b
void ScriptEditorDebugger::_bind_methods() {