mirrors
/
unicorn
mirror of https://github.com/unicorn-engine/unicorn
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gitignore seems to have an undisclosed conflict?! fixed here.

This commit is contained in:
xorstream 2017-01-23 01:13:13 +11:00
parent 724c765028
commit c8d1287e10
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -7,12 +7,9 @@
*.so *.so
*.so.* *.so.*
*.exe *.exe
<<<<<<< Updated upstream
*.dll *.dll
*.class *.class
*.jar *.jar
=======
>>>>>>> Stashed changes
qemu/config-all-devices.mak qemu/config-all-devices.mak