Merge master.
authorCarl Hetherington <cth@carlh.net>
Mon, 21 Jan 2013 21:02:51 +0000 (21:02 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 21 Jan 2013 21:02:51 +0000 (21:02 +0000)
commite04553be273a10e7face6f8f245d9a37e05454d2
treec7ad2c97e224a13483612fee8a93a524a39055ab
parentc21da9cdd8284e8d36a08bc7976744a3cd74bede
parent102c567af0eaa478f062971ae8dd5f6891e1457d
Merge master.
src/picture_asset.cc
src/sound_asset.cc