Merged default into minor

--HG--
branch : minor

src/libraries/ddsparse/ddsparse.cpp

@@ -116,7 +116,7 @@ static Format parseDX10Format(DXGIFormat fmt)
 		f = FORMAT_BC6H;
 		break;
 	case DXGI_FORMAT_BC6H_SF16:
-		f = FORAMT_BC6Hs;
+		f = FORMAT_BC6Hs;
 		break;
 	case DXGI_FORMAT_BC7_TYPELESS:
 	case DXGI_FORMAT_BC7_UNORM:

src/libraries/ddsparse/ddsparse.h

@@ -45,7 +45,7 @@ enum Format
 	FORMAT_BC5,
 	FORMAT_BC5s,
 	FORMAT_BC6H,
-	FORAMT_BC6Hs,
+	FORMAT_BC6Hs,
 	FORMAT_BC7,
 	FORMAT_BC7srgb, // sRGB color space.
 	FORMAT_UNKNOWN