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

[main] Fix version string generation #137

Merged
merged 2 commits into from
Mar 30, 2017

Conversation

eumagga0x2a
Copy link
Collaborator

@eumagga0x2a eumagga0x2a commented Mar 29, 2017

I would restrain from pushing even trivial changes on my own while in release mode. This too-late-patch fixes the version string generation for the Avidemux log header.

@mean00
Copy link
Owner

mean00 commented Mar 29, 2017

I'll just wait a day or two to see if people are reporting nasty problems and switch back to "normal" mode

  • create a support branch
    Then you can merge all you want :)

@eumagga0x2a
Copy link
Collaborator Author

There is no urge :-) I've deleted the second commit in this PR, the patch there worked, but the approach was wrong. It looks like the current ADM code confuses unsetting a variable (ADM_SUBVERSION) and setting it to zero. I'll fix it tomorrow.

@eumagga0x2a
Copy link
Collaborator Author

The new version of the second patch unifies the logic of the version string generation (developer build vs. release) and takes care about more places in the tree.

@eumagga0x2a eumagga0x2a merged commit 148a4fa into mean00:master Mar 30, 2017
@eumagga0x2a
Copy link
Collaborator Author

Oops, did you mean that I should have merged these patches into the "support" branch first?

@mean00
Copy link
Owner

mean00 commented Mar 30, 2017 via email

@eumagga0x2a eumagga0x2a deleted the adm-version-print branch April 2, 2017 10:16
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