Merge branch 'confprec'
authorQuan Nguyen <quannguyen@berkeley.edu>
Tue, 21 Jan 2014 04:33:22 +0000 (20:33 -0800)
committerQuan Nguyen <quannguyen@berkeley.edu>
Tue, 21 Jan 2014 04:33:22 +0000 (20:33 -0800)
Conflicts:
hwacha/hwacha.mk.in

1  2 
hwacha/decode_hwacha.h
hwacha/hwacha.mk.in

Simple merge
Simple merge