Commit Graph
9 Commits
Author SHA1 Message Date
jose.rodriguezlabra 0d9cc2b890 Erased weird numbers 2019-02-16 12:50:02 -05:00
jose.rodriguezlabra d60aa9d1e8 more stuff 2019-02-16 12:42:09 -05:00
jose.rodriguezlabra 22bf2728ba Merge branch 'master' of https://git.williammiceli.systems/williammiceli-wmu/ece3570-lab2
# Conflicts:
#	lab2CA.cache/wt/webtalk_pa.xml
#	lab2CA.srcs/sources_1/new/BasicModules.v
2019-02-16 12:39:15 -05:00
jose.rodriguezlabra 9aa7a5f0b0 stuff 2019-02-16 12:37:12 -05:00
jose.rodriguezlabra bb578e7264 Merge branch 'master' of https://git.williammiceli.systems/williammiceli-wmu/ece3570-lab2
# Conflicts:
#	lab2CA.cache/wt/webtalk_pa.xml
#	lab2CA.runs/.jobs/vrs_config_1.xml
#	lab2CA.runs/.jobs/vrs_config_2.xml
#	lab2CA.srcs/sources_1/new/BasicModules.v
2019-02-16 12:33:12 -05:00
jose.rodriguezlabra 0b358a6c41 Set some comments 2019-02-15 12:38:07 -05:00
jose.rodriguezlabra 7aa2cfff2a Modularized project; mux, clock, and reg done; Progress on RegFile 2019-02-15 12:24:26 -05:00
jose.rodriguezlabra d147e12073 Forgot to stage this file 2019-02-15 11:53:54 -05:00
jose.rodriguezlabra 3378e5bfd8 Merge resolve? 2019-02-15 11:53:29 -05:00