tsai
/
ImageSharp
mirror of https://github.com/SixLabors/ImageSharp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of https://github.com/antonfirsov/ImageSharp 

Conflicts:
	tests/ImageSharp.Tests46/Formats/Jpg/ReferenceDCT.cs
af/merge-core
Anton Firszov 9 years ago
parent
f96feb6084 c9677898cb
commit
aa4565d27c
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available