Fix merge.
authorCarl Hetherington <cth@carlh.net>
Mon, 14 Jan 2013 20:24:48 +0000 (20:24 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 14 Jan 2013 20:24:48 +0000 (20:24 +0000)
commit84d778a7a2816dc653ec4495d565a8a869b7a40c
tree700baa056cf7d090c15a0d88135d6f84cc4465ee
parented6a471b61d36a3ba7e8696fa3e5606406c5cf62
Fix merge.
src/reel.cc
src/sound_asset.h
test/tests.cc