Commit 6342ded2 authored by Roland Levillain's avatar Roland Levillain
Browse files

Merge branch 'master' into next-next

Conflicts:
	milena/ChangeLog
parents 2da2a4a8 3c76d368
2011-05-20 Thierry GERAUD <thierry.geraud@lrde.epita.fr>
* img/lena.pgm: Replace by official version;
see http://www.ece.rice.edu/~wakin/images/
2010-11-29 Roland Levillain <roland@lrde.epita.fr>
 
Address some errors reported by clang.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment