contrib/favicon.ico
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 30 Jan 2006 12:02:06 +1300
changeset 1663 d529cdc0a3ee
parent 1277 0bf11906df28
permissions -rw-r--r--
return a non-zero exit code when a merge failed

(binary:image/vnd.microsoft.icon)