Fix merge; other tweaks.
authorCarl Hetherington <cth@carlh.net>
Sun, 4 Nov 2012 19:57:17 +0000 (19:57 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 4 Nov 2012 19:57:17 +0000 (19:57 +0000)
commitb7466a9653345bc51db4cb1d7e960bfc4c12721f
tree1de42bc7c5973cecfdedc93d95671fdc7096be68
parentfe4e160ba2df273e8e065d0d12411eba35b00ebf
parentc2dc03da9cc94fd9bd7e530363b113564237f00e
Fix merge; other tweaks.
src/lib/decoder.cc
src/lib/decoder.h
src/lib/util.h
test/test.cc