| commit | 9df995e39e035809238a62979c20d079160b6466 | [log] [tgz] |
|---|---|---|
| author | Jeff Muizelaar <jmuizelaar@mozilla.com> | Thu Jul 15 19:16:01 2010 -0400 |
| committer | Jeff Muizelaar <jmuizelaar@mozilla.com> | Thu Jul 15 19:16:01 2010 -0400 |
| tree | 02b4c13e5dfc83f0f2f1ad28b3f30a834cb11511 | |
| parent | 79c78e4afd7b0657f023c213804accd4427d1859 [diff] | |
| parent | bc4eafb77a3479532ab0ef968c0287a8aea9b3c2 [diff] |
Merge branch 'v4' of /Users/jrmuizel/src/qcms-benoit/git/qcms into v4 Conflicts: iccread.c