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)
commitbd9a5a429dad8ab54ae28d783eea6c3d7b6905f3
tree52dc5399acc84edb2a786689bab2484047931141
parent733dc842be471799cdbd610fd62355f651d8af96
parent64785705a4de6b49ee5e97169ff151e1d6d4598b
Merge branch 'confprec'

Conflicts:
hwacha/hwacha.mk.in
hwacha/decode_hwacha.h
hwacha/hwacha.mk.in