Fixed conflicts

2014-02-16 21:57:36 +04:00
parent 4375b9dd2a bd8ff4ca11
commit 931929a82c
62 changed files with 1682 additions and 704 deletions
@@ -28,6 +28,7 @@
 *.unsuccessfulbuild
 *.res
 *.dump
+*.wav

 /libs
 /ipch
@@ -52,3 +53,6 @@ rpcs3/git-version.h
 !/bin/dev_hdd0/game/
 /bin/dev_hdd0/game/*
 !/bin/dev_hdd0/game/TEST12345/
+
+# Ignore other system generated files
+bin/dev_hdd0/home/00000001/trophy