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

drivers/jpegd/image_loader_jpegd.cpp

@@ -63,7 +63,7 @@ Error ImageLoaderJPG::load_image(Image *p_image,FileAccess *f) {
 	for (int y = 0; y < image_height; y++)
 	{
 		const jpgd::uint8* pScan_line;
-		uint scan_line_len;
+		jpgd::uint scan_line_len;
 		if (decoder.decode((const void**)&pScan_line, &scan_line_len) != jpgd::JPGD_SUCCESS)
 		{
 			return ERR_FILE_CORRUPT;

platform/windows/joystick.h

@@ -44,6 +44,9 @@ if(x != NULL)           \
 }
 #endif
 
+#ifndef XUSER_MAX_COUNT
+#define XUSER_MAX_COUNT 4
+#endif
 
 class joystick_windows
 {

tools/export/blender25/io_scene_dae/export_dae.py

@@ -921,7 +921,7 @@ class DaeExporter:
 			if (node.parent.type=="ARMATURE"):
 				armature=node.parent
 				if (armcount>1):
-					self.operator.report({'WARNING'},'Object "'+node.name+'" refers to more than one armature! This is unsopported.')
+					self.operator.report({'WARNING'},'Object "'+node.name+'" refers to more than one armature! This is unsupported.')
 				if (armcount==0):
 					self.operator.report({'WARNING'},'Object "'+node.name+'" is child of an armature, but has no armature modifier.')