...
Merge remote-tracking branch 'origin/master'

Conflicts:
	ProgTest.wcfg
	TOP.vhd
	_xmsgs/pn_parser.xmsgs
	fuse.log
	fuseRelaunch.cmd
	iseconfig/TOP.xreport
	isim.log
	isim/ProgTest_isim_beh.exe.sim/ISimEngine-DesignHierarchy.dbg
	isim/ProgTest_isim_beh.exe.sim/ProgTest_isim_beh.exe
	isim/ProgTest_isim_beh.exe.sim/isimkernel.log
	isim/ProgTest_isim_beh.exe.sim/netId.dat
	isim/ProgTest_isim_beh.exe.sim/tmp_save/_1
	isim/ProgTest_isim_beh.exe.sim/work/a_0089422443_0518719658.didat
	isim/ProgTest_isim_beh.exe.sim/work/a_0208324991_4109238584.didat
	isim/ProgTest_isim_beh.exe.sim/work/a_0298721934_0518719658.didat
	isim/ProgTest_isim_beh.exe.sim/work/a_0556179135_3212880686.didat
	isim/ProgTest_isim_beh.exe.sim/work/a_0728078519_4109238584.didat
	isim/ProgTest_isim_beh.exe.sim/work/a_0801766629_2372691052.didat
	isim/ProgTest_isim_beh.exe.sim/work/a_0918647622_0518719658.didat
	isim/ProgTest_isim_beh.exe.sim/work/a_0949460200_1679435033.didat
	isim/ProgTest_isim_beh.exe.sim/work/a_1090761533_0518719658.didat
	isim/ProgTest_isim_beh.exe.sim/work/a_1111616105_3839485643.didat
	isim/ProgTest_isim_beh.exe.sim/work/a_1335952598_3783779014.didat
	isim/ProgTest_isim_beh.exe.sim/work/a_1335952598_3783779014.nt64.obj
	isim/ProgTest_isim_beh.exe.sim/work/a_1375705109_3015860550.didat
	isim/ProgTest_isim_beh.exe.sim/work/a_1394678656_3015860550.didat
	isim/ProgTest_isim_beh.exe.sim/work/a_1430113433_2232266757.c
	isim/ProgTest_isim_beh.exe.sim/work/a_1430113433_2232266757.didat
	isim/ProgTest_isim_beh.exe.sim/work/a_1430113433_2232266757.nt64.obj
	isim/ProgTest_isim_beh.exe.sim/work/a_1516984793_4109238584.didat
	isim/ProgTest_isim_beh.exe.sim/work/a_1845507895_3852387523.didat
	isim/ProgTest_isim_beh.exe.sim/work/a_1991350011_0317204477.didat
	isim/ProgTest_isim_beh.exe.sim/work/a_2074609924_4109238584.didat
	isim/ProgTest_isim_beh.exe.sim/work/a_2096391741_1132359711.didat
	isim/ProgTest_isim_beh.exe.sim/work/a_2275834632_3015860550.didat
	isim/ProgTest_isim_beh.exe.sim/work/a_2539278368_0518719658.didat
	isim/ProgTest_isim_beh.exe.sim/work/a_2918312473_4109238584.didat
	isim/ProgTest_isim_beh.exe.sim/work/a_3081869000_2153311146.didat
	isim/ProgTest_isim_beh.exe.sim/work/a_3396455867_1781091266.didat
	isim/ProgTest_isim_beh.exe.sim/work/a_3614173883_3015860550.didat
	isim/ProgTest_isim_beh.exe.sim/work/a_3682612978_2513654025.didat
	isim/ProgTest_isim_beh.exe.sim/work/a_4033133427_3015860550.didat
	isim/isim_usage_statistics.html
	isim/precompiled.exe.sim/ieee/p_1242562249.didat
	isim/precompiled.exe.sim/ieee/p_2592010699.didat
	isim/precompiled.exe.sim/ieee/p_3499444699.didat
	isim/precompiled.exe.sim/ieee/p_3620187407.didat
	isim/temp/controlunit.vdb
	isim/temp/mips.vdb
	isim/temp/progtest.vdb
	isim/temp/regfile.vdb
	isim/work/adder.vdb
	isim/work/alu.vdb
	isim/work/alucontrolgenerator.vdb
	isim/work/instrdecoder.vdb
	isim/work/pc.vdb
	isim/work/shifter.vdb
	isim/work/signextender.vdb
	isim/work/sllshifter.vdb
	isim/work/srashifter.vdb
	isim/work/srlshifter.vdb
	isim/work/top.vdb
	lab3.gise
	lab3.xise
	progTest_isim_beh.wdb