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

sakura editor 本体の PR #1085 で ver 2.4.0.0 向けに修正されていたファイルを除いて取り込み #54

Merged

Conversation

m-tmatma
Copy link
Member

@m-tmatma m-tmatma commented Dec 7, 2019

sakura-editor/sakura#1085 で ver 2.4.0.0 向けに修正されていたファイルを除いて取り込み

sakura-editor/sakura#1085 の修正のうち ver 2.4.0.0 向けに
内容の修正がすでに入っていた Grep.png および GrepReplace.png 以外を取り込み

目的

#47 および #48 の対応をする際に
sakura editor 本体との差分を可能な限り少なくしてレビューしやすくするため。

@KENCHjp
Copy link
Member

KENCHjp commented Dec 8, 2019

おお、やろうとはおもってたんですが、助かります。私やってたらv2.4.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 532ece3 into sakura-editor:master Dec 9, 2019
@m-tmatma m-tmatma deleted the feature/sakura-PR1085-partial branch December 9, 2019 03:29
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