build: fix merge
authorFlorent Kermarrec <florent@enjoy-digital.fr>
Wed, 28 Feb 2018 22:10:24 +0000 (23:10 +0100)
committerFlorent Kermarrec <florent@enjoy-digital.fr>
Wed, 28 Feb 2018 22:10:24 +0000 (23:10 +0100)
commit2ff50a8882a82e0c2f159db7f1ba2f8a499e604f
tree0252d268e395e485c62fa8f80ca7843d30f43935
parent64e4e1ce84daad98d6120f075e27f4a8a5060271
build: fix merge
litex/build/xilinx/ise.py
litex/build/xilinx/vivado.py