Merging with current msvc 2

2017-01-23 01:07:50 +11:00
parent e46f86c80b
commit 724c765028
3 changed files with 60 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -7,9 +7,12 @@
 *.so
 *.so.*
 *.exe
+<<<<<<< Updated upstream
 *.dll
 *.class
 *.jar
+=======
+>>>>>>> Stashed changes

 qemu/config-all-devices.mak