Fix merge.
authorCarl Hetherington <cth@carlh.net>
Mon, 16 Jan 2017 00:21:23 +0000 (00:21 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 19 Apr 2017 22:04:32 +0000 (23:04 +0100)
commit26807fe95fb7fbf0e5e6a8e32ab35068712ef058
tree62bab5bf8084727a8ecfb8b6e289867968baf853
parenteb135e8dcdf36ae82420bcd18e954ad593b3e9a5
Fix merge.
src/lib/encoder.cc