Skip to content

Cleanup - #654

Merged
hugovk merged 32 commits into
python-pillow:masterfrom
wiredfool:cleanup
Jun 24, 2014
Merged

hugovk merged 32 commits into
python-pillow:masterfrom
wiredfool:cleanup

Conversation

@wiredfool

Copy link
Copy Markdown
Member

Replaces #616, includes #626 and #627.

@aclark4life

Copy link
Copy Markdown
Member

Needs manual merge

@aclark4life aclark4life added this to the 2.5.0 milestone Jun 7, 2014
@wiredfool

Copy link
Copy Markdown
Member Author

I did a merge on this up to just before the unittest merge, but there are still conflicts with the unittest conversion. So, this has to wait till we get that one sorted out.

aclark4life and others added 6 commits June 22, 2014 20:38
…redfool-cleanup

Conflicts:
	Tests/test_file_jpeg2k.py
	Tests/test_image_transform.py
	Tests/test_imagesequence.py
@hugovk

hugovk commented Jun 23, 2014

Copy link
Copy Markdown
Member

PR wiredfool#1 has a merge of this into (latest, post-unittest) master and fixes the three unittest conflicts.

hugovk added a commit that referenced this pull request Jun 24, 2014
@hugovk
hugovk merged commit 0cd5241 into python-pillow:master Jun 24, 2014
@wiredfool
wiredfool deleted the cleanup branch September 23, 2014 16:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants