Archive/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-28 13:28:01 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

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

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

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