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

2016-08-02 19:11:47 -03:00
parent ad313097eb cea9491806
commit 3d1d190dcd
79 changed files with 1339 additions and 1545 deletions
--- a/tools/editor/code_editor.h
+++ b/tools/editor/code_editor.h
@@ -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;