Commit 080053fa authored by Mikhail Karpenko's avatar Mikhail Karpenko

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
parents 707ddf4c ceb85327
bin bin
tmp tmp
src/com/elphel/vdt/veditor
_generated
src/com/elphel/vdt/core/launching/VDTErrorParser.java
about_veditor.html
ChangeLogVeditor.txt
CONTRIBUTORS_VEDITOR.txt
This diff is collapsed.
...@@ -14,7 +14,8 @@ bin.includes = icons/,\ ...@@ -14,7 +14,8 @@ bin.includes = icons/,\
LICENSE,\ LICENSE,\
INSTALL,\ INSTALL,\
CONTRIBUTORS_VEDITOR.txt,\ CONTRIBUTORS_VEDITOR.txt,\
parsers/ parsers/,\
bin/
# #
# Set the following to override the environment # Set the following to override the environment
......
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
<menu name="Vivado" <menu name="Vivado"
label="Vivado Tools" label="Vivado Tools"
icon="xilinx.png"> icon="vivado_logo.png">
<menu name="VivadoUtils" <menu name="VivadoUtils"
label="Vivado utilities" label="Vivado utilities"
icon="setup.png"> icon="setup.png">
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</extensions-list> </extensions-list>
<action-menu> <action-menu>
<action label="Vivado Command" resource="" icon="xilinx.png" /> <action label="Vivado Command" resource="" icon="vivado_logo.png" />
</action-menu> </action-menu>
<parameter id="TCLCommand" label="Remote TCL Command to send" <parameter id="TCLCommand" label="Remote TCL Command to send"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment