diff options
| author | sanikoyes <sanikoyes@163.com> | 2014-04-06 21:52:47 +0800 |
|---|---|---|
| committer | sanikoyes <sanikoyes@163.com> | 2014-04-06 21:52:47 +0800 |
| commit | 77a840e350668a9c80b1e63b9b73aac44221c53b (patch) | |
| tree | 40d2115e639bdc72a61811ac4f2fb0f04ec8eb7f /core/variant.cpp | |
| parent | 14bbdcb139b35e6d206df1ab3176d34245b72329 (diff) | |
| parent | ded365031ede27b7a6efef59bc886343f58d310b (diff) | |
Merge branch 'master' into hotfix-android-unicode-ime-input
Diffstat (limited to 'core/variant.cpp')
| -rw-r--r-- | core/variant.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/variant.cpp b/core/variant.cpp index efb6b8296b..e02c9c33a1 100644 --- a/core/variant.cpp +++ b/core/variant.cpp @@ -56,7 +56,7 @@ String Variant::get_type_name(Variant::Type p_type) { } break; case REAL: { - return "real"; + return "float"; } break; case STRING: { |