Johannes 15b58e43fb Merge branch 'master' of https://git.williammiceli.systems/williammiceli-wmu/ece3570-lab2 ...

# Conflicts:
#	lab2CA.cache/wt/webtalk_pa.xml
#	lab2CA.runs/impl_1/gen_run.xml
#	lab2CA.sim/sim_1/behav/xsim/xelab.pb
#	lab2CA.sim/sim_1/behav/xsim/xsim.dir/CPU9bits_tb_behav/webtalk/xsim_webtalk.tcl
#	lab2CA.sim/sim_1/behav/xsim/xsim.dir/CPU9bits_tb_behav/xsim.mem
#	lab2CA.sim/sim_1/behav/xsim/xvlog.pb
#	lab2CA.srcs/sources_1/new/instructionMemory.v
#	lab2CA.xpr

2019-04-11 21:55:30 -04:00

..

bd/design_1

Added SLT

2019-03-12 19:49:46 -04:00

new

Merge branch 'master' of https://git.williammiceli.systems/williammiceli-wmu/ece3570-lab2

2019-04-11 21:55:30 -04:00