Christopher Celio 91efdc379b Merge remote-tracking branch 'origin/master' into ss-frontend ...

Also fixed bridx logic and zero-width wire logic.

Conflicts:
	src/main/scala/btb.scala

2014-10-14 18:10:29 -07:00

..

main/scala

Merge remote-tracking branch 'origin/master' into ss-frontend

2014-10-14 18:10:29 -07:00