Merge branch 'master' of https://github.com/DHrpcs3/rpcs3

2014-05-25 01:46:25 +04:00
parent 6072fd2fbb 33584b6668
commit 8a1227eaa2
24 changed files with 457 additions and 111 deletions
@@ -45,6 +45,10 @@
 /bin/*.exp
 rpcs3/git-version.h

+# Visual Studio Profiler Files
+*.vspx
+*.psess
+
 # Copyrighted files
 /bin/data/
 /bin/dev_flash/data/font