# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1346585831 18000
# Node ID 0b4ff504157da4f918c91887227c982f3b5f1e93
# Parent  747d47d96d2f936eda29f67a5408831ee123e1b3# Parent  2fda49e1d0c5ded5c244d781d25336f924383670
merge.

diff -r 747d47d96d2f -r 0b4ff504157d images/gb_chibi.png
Binary file images/gb_chibi.png has changed