Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/godotengine/godot

Browse source
This commit is contained in:
Juan Linietsky 2016-08-02 19:11:47 -03:00
commit 3d1d190dcd
79 changed files with 1339 additions and 1545 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tools/editor/code_editor.h
View file

@ -198,7 +198,8 @@ class CodeTextEditor : public VBoxContainer {
TextEdit *text_editor;
FindReplaceBar *find_replace_bar;
Label *line_col;
Label *line_nb;
Label *col_nb;
Label *info;
Timer *idle;
Timer *code_complete_timer;