adas
SRAM
'master' of https://github.com/benrafshoon/eecs392

Conflicts:
	Sram/db/sram.(0).cnf.cdb
	Sram/db/sram.(0).cnf.hdb
	Sram/db/sram.(1).cnf.cdb
	Sram/db/sram.(1).cnf.hdb
	Sram/db/sram.(2).cnf.cdb
	Sram/db/sram.(2).cnf.hdb
	Sram/db/sram.(3).cnf.cdb
	Sram/db/sram.(3).cnf.hdb
	Sram/db/sram.(4).cnf.cdb
	Sram/db/sram.(4).cnf.hdb
	Sram/db/sram.(5).cnf.cdb
	Sram/db/sram.(5).cnf.hdb
	Sram/db/sram.(6).cnf.cdb
	Sram/db/sram.(6).cnf.hdb
	Sram/db/sram.(7).cnf.cdb
	Sram/db/sram.(7).cnf.hdb
	Sram/db/sram.asm.qmsg
	Sram/db/sram.asm.rdb
	Sram/db/sram.asm_labs.ddb
	Sram/db/sram.cmp.bpm
	Sram/db/sram.cmp.cdb
	Sram/db/sram.cmp.hdb
	Sram/db/sram.cmp.idb
	Sram/db/sram.cmp.kpt
	Sram/db/sram.cmp0.ddb
	Sram/db/sram.cmp1.ddb
	Sram/db/sram.cmp_merge.kpt
	Sram/db/sram.fit.qmsg
	Sram/db/sram.hier_info
	Sram/db/sram.hif
	Sram/db/sram.lpc.html
	Sram/db/sram.lpc.rdb
	Sram/db/sram.lpc.txt
	Sram/db/sram.map.bpm
	Sram/db/sram.map.cdb
	Sram/db/sram.map.hdb
	Sram/db/sram.map.kpt
	Sram/db/sram.map.logdb
	Sram/db/sram.map_bb.cdb
	Sram/db/sram.map_bb.logdb
	Sram/db/sram.pplq.rdb
	Sram/db/sram.pre_map.hdb
	Sram/db/sram.root_partition.map.reg_db.cdb
	Sram/db/sram.routing.rdb
	Sram/db/sram.rtlv.hdb
	Sram/db/sram.rtlv_sg.cdb
	Sram/db/sram.rtlv_sg_swap.cdb
	Sram/db/sram.sgdiff.cdb
	Sram/db/sram.sgdiff.hdb
	Sram/db/sram.sld_design_entry_dsc.sci
	Sram/db/sram.smp_dump.txt
	Sram/db/sram.sta.qmsg
	Sram/db/sram.sta.rdb
	Sram/db/sram.sta_cmp.6_slow.tdb
	Sram/db/sram.vpr.ammdb
	Sram/incremental_db/compiled_partitions/sram.root_partition.cmp.ammdb
	Sram/incremental_db/compiled_partitions/sram.root_partition.cmp.cdb
	Sram/incremental_db/compiled_partitions/sram.root_partition.cmp.hdb
	Sram/incremental_db/compiled_partitions/sram.root_partition.cmp.rcfdb
	Sram/incremental_db/compiled_partitions/sram.root_partition.map.cdb

Sram/incremental_db/compiled_partitions/sram.root_partition.map.hbdb.cdb

Sram/incremental_db/compiled_partitions/sram.root_partition.map.hbdb.hdb
	Sram/incremental_db/compiled_partitions/sram.root_partition.map.hdb
	de2-115/camerainterface.qws
	de2-115/db/camerainterface.(0).cnf.cdb
	de2-115/db/camerainterface.(0).cnf.hdb
	de2-115/db/camerainterface.(2).cnf.cdb
	de2-115/db/camerainterface.(2).cnf.hdb
	de2-115/db/camerainterface.asm.qmsg
	de2-115/db/camerainterface.asm.rdb
	de2-115/db/camerainterface.asm_labs.ddb
	de2-115/db/camerainterface.cmp.bpm
	de2-115/db/camerainterface.cmp.cdb
	de2-115/db/camerainterface.cmp.hdb
	de2-115/db/camerainterface.cmp.idb
	de2-115/db/camerainterface.cmp.logdb
	de2-115/db/camerainterface.cmp.rdb

de2-115/db/camerainterface.cycloneive_io_sim_cache.45um_ff_1200mv_0c_fas
t.hsd
	de2-115/db/camerainterface.db_info
	de2-115/db/camerainterface.fit.qmsg
	de2-115/db/camerainterface.hier_info
	de2-115/db/camerainterface.hif
	de2-115/db/camerainterface.lpc.html
	de2-115/db/camerainterface.lpc.rdb
	de2-115/db/camerainterface.lpc.txt
	de2-115/db/camerainterface.map.bpm
	de2-115/db/camerainterface.map.cdb
	de2-115/db/camerainterface.map.hdb
	de2-115/db/camerainterface.map.kpt
	de2-115/db/camerainterface.map.qmsg
	de2-115/db/camerainterface.map.rdb
	de2-115/db/camerainterface.map_bb.cdb
	de2-115/db/camerainterface.map_bb.hdb
	de2-115/db/camerainterface.npp.qmsg
	de2-115/db/camerainterface.pre_map.hdb
	de2-115/db/camerainterface.root_partition.map.reg_db.cdb
	de2-115/db/camerainterface.routing.rdb
	de2-115/db/camerainterface.rtlv.hdb
	de2-115/db/camerainterface.rtlv_sg.cdb
	de2-115/db/camerainterface.rtlv_sg_swap.cdb
	de2-115/db/camerainterface.sgate.nvd
	de2-115/db/camerainterface.sgate_sm.nvd
	de2-115/db/camerainterface.sgdiff.cdb
	de2-115/db/camerainterface.sgdiff.hdb
	de2-115/db/camerainterface.sta.qmsg
	de2-115/db/camerainterface.sta.rdb
	de2-115/db/camerainterface.sta_cmp.8_slow_1200mv_85c.tdb
	de2-115/db/camerainterface.tiscmp.fast_1200mv_0c.ddb
	de2-115/db/camerainterface.tiscmp.fastest_slow_1200mv_0c.ddb
	de2-115/db/camerainterface.tiscmp.fastest_slow_1200mv_85c.ddb
	de2-115/db/camerainterface.tiscmp.slow_1200mv_0c.ddb
	de2-115/db/camerainterface.tiscmp.slow_1200mv_85c.ddb
	de2-115/db/camerainterface.tmw_info
	de2-115/db/camerainterface.vpr.ammdb

de2-115/incremental_db/compiled_partitions/camerainterface.root_partitio
n.cmp.ammdb

de2-115/incremental_db/compiled_partitions/camerainterface.root_partitio
n.cmp.cdb

de2-115/incremental_db/compiled_partitions/camerainterface.root_partitio
n.cmp.hdb

de2-115/incremental_db/compiled_partitions/camerainterface.root_partitio
n.cmp.rcfdb

de2-115/incremental_db/compiled_partitions/camerainterface.root_partitio
n.map.cdb

de2-115/incremental_db/compiled_partitions/camerainterface.root_partitio
n.map.dpi

de2-115/incremental_db/compiled_partitions/camerainterface.root_partitio
n.map.hbdb.cdb

de2-115/incremental_db/compiled_partitions/camerainterface.root_partitio
n.map.hbdb.hdb

de2-115/incremental_db/compiled_partitions/camerainterface.root_partitio
n.map.hdb

de2-115/incremental_db/compiled_partitions/camerainterface.root_partitio
n.map.kpt
Serial_code
serial_code