Merge branch 'master' of github.com:optimize-fast/IEEE754Adder

Conflicts:
	IEEE754Adder.xise
	fuse.log
	fuseRelaunch.cmd
	isim.log
	isim/isim_usage_statistics.html
	isim/precompiled.exe.sim/ieee/p_2592010699.didat
This commit is contained in:
2019-08-28 22:03:08 +02:00
130 changed files with 4284 additions and 57 deletions

5
fuseRelaunch.cmd~ Normal file
View File

@@ -0,0 +1,5 @@
<<<<<<< HEAD
-intstyle "ise" -incremental -lib "secureip" -o "/home/Luca/ISE/IEEE754Adder/AdderTest_isim_beh.exe" -prj "/home/Luca/ISE/IEEE754Adder/AdderTest_beh.prj" "work.AdderTest"
=======
-intstyle "ise" -incremental -lib "secureip" -o "/home/ise/gianni/IEEE754Adder/FullAdderTest_isim_beh.exe" -prj "/home/ise/gianni/IEEE754Adder/FullAdderTest_beh.prj" "work.FullAdderTest"
>>>>>>> 8b08af27823a5242424518ae45bac27cb9e28f6d