Commit 2860567f authored by Henry Cook's avatar Henry Cook
Browse files

Merge branch 'master' of github.com:ucb-bar/hardfloat into chisel-v2

Conflicts:
	chisel
	sbt/project/build.scala
	src/main/scala/anyToRecodedFloatN.scala
	src/main/scala/mulAddSubRecodedFloatN.scala
	src/main/scala/normalize64.scala
	src/main/scala/normalizeN.scala
	src/main/scala/shift_right_track_lsbs.scala
	src/main/scala/shift_round_position.scala
	src/main/scala/top.scala
parents ea4d97c0 7af7f845
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment