Merge remote-tracking branch 'origin/master' into fcitx

fcitx · Jul 8, 2024 · 61bdc1e · 61bdc1e
2 parents be1d684 + 183b5e8
commit 61bdc1e
Show file tree

Hide file tree

Showing 13 changed files with 1 addition and 1 deletion.
diff --git a/src/data/images/mac/product_icon.icns b/src/data/images/mac/product_icon.icns
diff --git a/src/data/images/product_icon.icns b/src/data/images/product_icon.icns
diff --git a/...mac/product_icon.iconset/icon_128x128.png → ...ges/product_icon.iconset/icon_128x128.png b/...mac/product_icon.iconset/icon_128x128.png → ...ges/product_icon.iconset/icon_128x128.png
diff --git a/...product_icon.iconset/icon_128x128at2x.png → ...product_icon.iconset/icon_128x128at2x.png b/...product_icon.iconset/icon_128x128at2x.png → ...product_icon.iconset/icon_128x128at2x.png
diff --git a/...s/mac/product_icon.iconset/icon_16x16.png → ...mages/product_icon.iconset/icon_16x16.png b/...s/mac/product_icon.iconset/icon_16x16.png → ...mages/product_icon.iconset/icon_16x16.png
diff --git a/...c/product_icon.iconset/icon_16x16at2x.png → ...s/product_icon.iconset/icon_16x16at2x.png b/...c/product_icon.iconset/icon_16x16at2x.png → ...s/product_icon.iconset/icon_16x16at2x.png
diff --git a/...mac/product_icon.iconset/icon_256x256.png → ...ges/product_icon.iconset/icon_256x256.png b/...mac/product_icon.iconset/icon_256x256.png → ...ges/product_icon.iconset/icon_256x256.png
diff --git a/...product_icon.iconset/icon_256x256at2x.png → ...product_icon.iconset/icon_256x256at2x.png b/...product_icon.iconset/icon_256x256at2x.png → ...product_icon.iconset/icon_256x256at2x.png
diff --git a/...s/mac/product_icon.iconset/icon_32x32.png → ...mages/product_icon.iconset/icon_32x32.png b/...s/mac/product_icon.iconset/icon_32x32.png → ...mages/product_icon.iconset/icon_32x32.png
diff --git a/...c/product_icon.iconset/icon_32x32at2x.png → ...s/product_icon.iconset/icon_32x32at2x.png b/...c/product_icon.iconset/icon_32x32at2x.png → ...s/product_icon.iconset/icon_32x32at2x.png
diff --git a/...mac/product_icon.iconset/icon_512x512.png → ...ges/product_icon.iconset/icon_512x512.png b/...mac/product_icon.iconset/icon_512x512.png → ...ges/product_icon.iconset/icon_512x512.png
diff --git a/...product_icon.iconset/icon_512x512at2x.png → ...product_icon.iconset/icon_512x512at2x.png b/...product_icon.iconset/icon_512x512at2x.png → ...product_icon.iconset/icon_512x512at2x.png
diff --git a/src/data/version/mozc_version_template.bzl b/src/data/version/mozc_version_template.bzl
@@ -32,7 +32,7 @@ MAJOR = 2
 MINOR = 30
 
 # BUILD number used for the OSS version.
-BUILD_OSS = 5490
+BUILD_OSS = 5520
 
 # Number to be increased. This value may be replaced by other tools.
 BUILD = BUILD_OSS