RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-25 12:12:50 +01:00
Code Issues Releases Wiki Activity

Fixed conflict with X11

Browse Source 
Added tmp folder to gitignore
This commit is contained in:
DHrpcs3 2015-12-21 08:48:33 +02:00
parent d8bef46c2a
commit 3ca634138d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -33,6 +33,7 @@
/build
/bin
/lib
/tmp
/ipch
/rpcs3/Debug
/rpcs3/Release

2
rpcs3/Emu/RSX/GL/rsx_gl_texture.cpp
View File

@ -1,10 +1,10 @@
#include "stdafx.h"
#include "Utilities/Log.h"
#include "rsx_gl_texture.h"
#include "gl_helpers.h"
#include "../GCM.h"
#include "../RSXThread.h"
#include "../RSXTexture.h"
#include "Utilities/Log.h"
namespace rsx
{