Skip to content

Very small fixes #1

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

Merged
merged 2 commits into from
May 19, 2016
Merged

Very small fixes #1

merged 2 commits into from
May 19, 2016

Conversation

Kirozen
Copy link
Contributor

@Kirozen Kirozen commented May 19, 2016

No description provided.

@sdottaka sdottaka merged commit a3bd24a into WinMerge:master May 19, 2016
@sdottaka
Copy link
Member

Thank you!

GreyMerlin added a commit to GreyMerlin/winmerge-v2 that referenced this pull request Mar 6, 2017
 * Poco projects now only have UnicodeDebug and UnicodeRelease
	configuration, these were all derived from 'static mt' configurations.
 * the static, dynamic, shared configurations are gone
 * identical style for Win32 and Win64
GreyMerlin added a commit to GreyMerlin/winmerge-v2 that referenced this pull request Mar 6, 2017
 * somehow a <PropertyGroup> tag became <DLLPropertyGroup>
sdottaka added a commit that referenced this pull request Sep 29, 2017
More on Issue #73 Fixed the -dl -dm and -dr description parameters for conflict files (for both 2 way and 3 way conflict files).

Approved-by: Takashi Sawanaka <[email protected]>
sdottaka pushed a commit that referenced this pull request Jun 2, 2019
sdottaka pushed a commit that referenced this pull request Apr 27, 2020
Merge pull request #313 from qosobrin/master
sdottaka added a commit that referenced this pull request Apr 26, 2025
…e crashes after successfully deleting files.)
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