| commit | 122cc1db6354ff7a0ef7bc3bbdb6c79d4889ee3f | [log] [tgz] |
|---|---|---|
| author | Jeff Muizelaar <jmuizelaar@mozilla.com> | Fri Jul 08 14:47:47 2011 -0400 |
| committer | Jeff Muizelaar <jmuizelaar@mozilla.com> | Fri Jul 08 14:47:47 2011 -0400 |
| tree | b17314f2d67c8d15977a8a4140f5f26af26e89f2 | |
| parent | e2d3e4b47d6e6b67905977f28b1cff950a69be61 [diff] | |
| parent | f89ec832f826cd79dba7bd136c57faa3b8d80b55 [diff] |
Merge branch 'master' of /Users/jrmuizel/bugs/colorspace/qcms into bnew Conflicts: transform.c