Giovanni Palma <giovanni(a)lrde.epita.fr> writes:
Index: integre/ChangeLog
from Giovanni Palma <giovanni(a)lrde.epita.fr>
* ntg/color/yuv.hh: Change the working interval.
* ntg/color/yiq.hh: Change the working interval.
* ntg/color/xyz.hh: Change the Z upperbound value.
* ntg/color/nrgb.hh: Change the working interval.
* ntg/color/hsi.hh: Change the Saturation upper bound value.
Index: metalic/ChangeLog
from Astrid Wang <astrid(a)lrde.epita.fr>
* mlc/array/1d.hh: Add member function name(). Fix types in member
function normalize(). Add basic arithmetic operators.
* mlc/array/2d.hh: Likewise.
* mlc/array/3d.hh: Likewise.
Euh, tu as fait ton diff avant de merger ?
Sinon, au choix:
- checkout le prj
- lance prdiff avec "prdiff -r@"