Merge branch 'master' of github.com:Elphel/vdt-plugin

6e00e4f8 · Andrey Filippov · bb266655 · 3d8f9162 · 6e00e4f8 · 6e00e4f8
Commit 6e00e4f8 authored Dec 27, 2015 by Andrey Filippov
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

.gitignore .gitignore +7 -0

ise_logo_48x48.png icons/ise_logo_48x48.png +0 -0

vivado_logo64x64.png icons/vivado_logo64x64.png +0 -0

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,10 @@ src/com/elphel/vdt/core/launching/VDTErrorParser.java
 about_veditor.html
 ChangeLogVeditor.txt
 CONTRIBUTORS_VEDITOR.txt
+
+src/com/elphel/vdt/veditor
+_generated
+src/com/elphel/vdt/core/launching/VDTErrorParser.java
+about_veditor.html
+ChangeLogVeditor.txt
+CONTRIBUTORS_VEDITOR.txt
--- a/icons/ise_logo_48x48.png
+++ b/icons/ise_logo_48x48.png
--- a/icons/vivado_logo64x64.png
+++ b/icons/vivado_logo64x64.png