Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

develop に master を取り込む #56

Merged
merged 9 commits into from
Dec 21, 2019
Merged

develop に master を取り込む #56

merged 9 commits into from
Dec 21, 2019

Conversation

m-tmatma
Copy link
Member

develop に master を取り込む

普通のシーケンスと逆だけど、ver 2.4用の修正を除外した修正を develop に入れた後で
develop に ver 2.4.0.0 用の修正を入れます。

#55 (comment)

m-tmatma added 9 commits May 18, 2019 19:37
e5172cb526f26ad18ec5754282886b6270459588 時点での sakura 本体のヘルプを正にして
文字コード変換による問題のみを取り込んで修正する。
Code Factor の警告対応
Code Factor の警告対応
PR #22 の際の文字コード変換時の誤りを修正
sakura editor 本体の PR #1085 で ver 2.4.0.0 向けに修正されていたファイルを除いて取り込み
Copy link
Member

@KENCHjp KENCHjp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

対応感謝。

@m-tmatma m-tmatma merged commit ce71bb8 into develop Dec 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants