Merge branch 'compact_record'
authorMatthias Kramm <kramm@quiss.org>
Wed, 31 Mar 2010 18:47:18 +0000 (11:47 -0700)
committerMatthias Kramm <kramm@quiss.org>
Wed, 31 Mar 2010 18:47:18 +0000 (11:47 -0700)
1  2 
lib/png.c

diff --cc lib/png.c
Simple merge