Luca Cuzzocrea
b6c1d7abe2
Conflicts: IEEE754Adder.xise fuse.log fuseRelaunch.cmd isim.log isim/isim_usage_statistics.html isim/precompiled.exe.sim/ieee/p_2592010699.didat
6 lines
430 B
Batchfile
6 lines
430 B
Batchfile
<<<<<<< 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
|