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

Backport bugfixes from trunk to 2.1 branch #405

Closed
gcode-importer opened this issue Sep 30, 2014 · 3 comments
Closed

Backport bugfixes from trunk to 2.1 branch #405

gcode-importer opened this issue Sep 30, 2014 · 3 comments
Assignees
Milestone

Comments

@gcode-importer
Copy link

Originally reported on Google Code with ID 405

compile bugfixes since last release and backport to maintained branches

Reported by detonin on 2014-09-30 12:22:05

@gcode-importer
Copy link
Author

Reported by mayeut on 2014-12-03 20:21:44

@detonin detonin modified the milestones: OPJ v1.5.3, OPJ v2.1.1 Sep 4, 2015
@detonin detonin changed the title Backport bugfixes from trunk to 1.5.2 and 2.1 Backport bugfixes from trunk to 2.1 branch Sep 4, 2015
@mayeut
Copy link
Collaborator

mayeut commented Sep 4, 2015

@detonin,

Isn't master the same as branch 2.1 ( need to check ABI/API #306 ) ?

@detonin
Copy link
Contributor

detonin commented Jan 25, 2016

@mayeut I merged master in 2.1 branch. According to https://github.com/uclouvain/openjpeg/wiki/DevelopmentProcess, we should actually have a 1.x.y, and a 2.x.y branch, instead of having different branches for minor versions bumps. Anyway, master always corresponds to the latest dev and merging into 2.1 makes sense as we are about to break or at least enhance the API in the next release.

@detonin detonin closed this as completed Jan 25, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

3 participants