4ian/GDevelop
1
0
Fork 0
mirror of https://github.com/4ian/GDevelop.git synced 2026-10-12 02:01:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into utf8-gdstring

Browse Source 
Conflicts:
	Core/GDCore/PlatformDefinition/Layout.cpp
This commit is contained in:
victorlevasseur
2015-07-17 23:18:17 +02:00
parent 445e0061a7 9c0c6cbdb0
commit 5c3c9fb413
61 changed files with 1843 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/source.pot
+1 -1
View File
@@ -18875,7 +18875,7 @@ msgid "Delete the selection\tDEL"
msgstr ""
#: ../Core/GDCore/IDE/Dialogs/LayoutEditorCanvas/LayoutEditorCanvas.cpp:232
msgid "Add an automatims to the object"
msgid "Add an automatism to the object"
msgstr ""
#: ../Core/GDCore/IDE/Dialogs/LayoutEditorCanvas/LayoutEditorCanvas.cpp:234