godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-19 14:31:59 +00:00
Code Releases Wiki Activity

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

Browse Source
This commit is contained in:
Juan Linietsky
2015-12-21 09:07:06 -03:00
parent 81f62fb78c b2f670ebae
commit 15429d6ac9
53 changed files with 3869 additions and 3209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/editor/editor_import_export.cpp
View File

@@ -1128,10 +1128,7 @@ Error EditorExportPlatform::save_zip(const String& p_path, bool p_make_bundles)
zipClose(zip,NULL);
if (err)
return err;
return err;
}
Error EditorExportPlatform::save_pack(FileAccess *dst,bool p_make_bundles, int p_alignment) {