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

.gitignore

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

SConstruct

@@ -88,7 +88,7 @@ if profile:
 	elif os.path.isfile(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('platform','Platform: '+str(platform_list)+'(sfml).',"")
 opts.Add('python','Build Python Support: (yes/no)','no')

tools/editor/io_plugins/editor_texture_import_plugin.cpp

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