| commit | 86771fe9fc6c19856af9316b7269be8cdf4e126e | [log] [tgz] |
|---|---|---|
| author | Jeff Muizelaar <jmuizelaar@mozilla.com> | Wed Jul 14 13:35:52 2010 -0400 |
| committer | Jeff Muizelaar <jmuizelaar@mozilla.com> | Wed Jul 14 13:35:52 2010 -0400 |
| tree | 2e84a0549519ec85769b9b97adc931b47bce88d5 | |
| parent | 8f9d06baa07af9b4474f384835e9c6970414d822 [diff] | |
| parent | bdf1eb60305b67d457c77044e90158625a01330e [diff] |
Merge branch 'master' into v4 Conflicts: Makefile iccread.c qcmsint.h transform.c