Merge remote-tracking branch 'vdt-open/master'
Conflicts: .gitignore build.properties install_and_patch_veditor.sh tools/Altera_Quartus/quartus_place.xml tools/Altera_Quartus/quartus_synthesis.xml tools/DesignMenu.xml tools/Xilinx_Vivado/vivado_test.xml
Showing