Merge branch 'master' into add-hsv

jcupitt · Jun 22, 2015 · bdc9684 · bdc9684
2 parents 17bace3 + 14dfda4
commit bdc9684
Show file tree

Hide file tree

Showing 3 changed files with 211 additions and 159 deletions.
diff --git a/doc/images/interconvert.png b/doc/images/interconvert.png
diff --git a/doc/images/interconvert.svg b/doc/images/interconvert.svg