OSDN Git Service

fucking merge failure!!! so annoying git merge.
-rw-r--r-- 287 .gitignore
drwxr-xr-x - de1_nes
drwxr-xr-x - doc
drwxr-xr-x - simulation
drwxr-xr-x - tools