Merge branch 'heads/upstream' into OBT/1.2.0(SpringUpdate)
This commit is contained in:
@@ -15,6 +15,7 @@ bld/
|
||||
[Rr]eleaseMac/
|
||||
[Dd]ebugLinux/
|
||||
[Rr]eleaseLinux/
|
||||
LocalMods/
|
||||
*.o
|
||||
*/Barotrauma*/doc/
|
||||
|
||||
|
||||
Reference in New Issue
Block a user