godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Juan Linietsky 2014-02-26 10:14:42 -03:00
commit a919683228
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -233,3 +233,4 @@ Desktop.ini
# Recycle Bin used on file shares # Recycle Bin used on file shares
$RECYCLE.BIN/ $RECYCLE.BIN/
logo.h

2
SConstruct
View File

@ -88,7 +88,7 @@ if profile:
elif os.path.isfile(profile+".py"): elif os.path.isfile(profile+".py"):
customs.append(profile+".py") customs.append(profile+".py")
opts=Options(customs, ARGUMENTS) opts=Variables(customs, ARGUMENTS)
opts.Add('target', 'Compile Target (debug/profile/release).', "debug") opts.Add('target', 'Compile Target (debug/profile/release).', "debug")
opts.Add('platform','Platform: '+str(platform_list)+'(sfml).',"") opts.Add('platform','Platform: '+str(platform_list)+'(sfml).',"")
opts.Add('python','Build Python Support: (yes/no)','no') opts.Add('python','Build Python Support: (yes/no)','no')

2
tools/editor/io_plugins/editor_texture_import_plugin.cpp
View File

@ -610,7 +610,7 @@ String EditorTextureImportPlugin::get_visible_name() const {
} break; } break;
case MODE_ATLAS: { case MODE_ATLAS: {
return "Atlas Teture"; return "Atlas Texture";
} break; } break;
} }