solved merge conflicts
authorCullen Jennings <fluffy@iii.ca>
Tue, 28 May 2013 02:31:09 +0000 (20:31 -0600)
committerCullen Jennings <fluffy@iii.ca>
Tue, 28 May 2013 02:31:09 +0000 (20:31 -0600)
commitcc7bf4b42c118e1d81733532b9ebb4a8c1f814bc
tree04a0f53c8273810a33ffe19733d7d769b2d064cb
parent0015854ab7957425a077477778e777beba18099c
parent4f4999e528efa4c386a62cc7c62072a5289dfb00
solved merge conflicts
src/encode.c
src/mcenc.c
src/state.h