Fixed conflict with X11

Added tmp folder to gitignore
2015-12-21 08:48:33 +02:00 · 2015-12-21 08:48:33 +02:00 · 3ca634138d
parent d8bef46c2a
commit 3ca634138d
2 changed files with 2 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -33,6 +33,7 @@
 /build
 /bin
 /lib
+/tmp
 /ipch
 /rpcs3/Debug
 /rpcs3/Release
--- a/rpcs3/Emu/RSX/GL/rsx_gl_texture.cpp
+++ b/rpcs3/Emu/RSX/GL/rsx_gl_texture.cpp
@ -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
 {