OSDN Git Service
(root)
/
motonesfpga
/
motonesfpga.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fucking merge failure!!! so annoying git merge.
[motonesfpga/motonesfpga.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index
b1ac17d
..
e23bf05
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-3,6
+3,7
@@
aaa
bbb
ghdl-dir
tmp/
bbb
ghdl-dir
tmp/
+old/
bl.sh
motonesemu
*.bin
bl.sh
motonesemu
*.bin
@@
-17,4
+18,9
@@
ref-sdr-sdram-vhdl.zip
DE1_control_panel
~$*
*.lnk
DE1_control_panel
~$*
*.lnk
+<<<<<<< HEAD
+bin2hex*
+=======
+cc65/
+>>>>>>> bc7cef00d67db16adec9f9c03eeacb3e3a09bbdf