.gitignore 425 Bytes
Newer Older
1
bin
Andrey Filippov's avatar
Andrey Filippov committed
2
tmp
3
*.directory
4 5 6
about_veditor.html
ChangeLogVeditor.txt
CONTRIBUTORS_VEDITOR.txt
7
cocotb
Andrey Filippov's avatar
Andrey Filippov committed
8
<<<<<<< HEAD
Andrey Filippov's avatar
Andrey Filippov committed
9

10 11 12 13 14 15 16
_generated_*
src/com/elphel/vdt/veditor
_generated
src/com/elphel/vdt/core/launching/VDTErrorParser.java
about_veditor.html
ChangeLogVeditor.txt
CONTRIBUTORS_VEDITOR.txt
Andrey Filippov's avatar
Andrey Filippov committed
17 18 19 20 21
=======
src/com/elphel/vdt/veditor
_generated
src/com/elphel/vdt/core/launching/VDTErrorParser.java
>>>>>>> 627cce33007b66f00dc7bdab8f1c567ad7577b23