From 3ca634138dce0742228f9d43febaf2a84d41bb3c Mon Sep 17 00:00:00 2001
From: DHrpcs3 <dh.rpcs3@gmail.com>
Date: Mon, 21 Dec 2015 08:48:33 +0200
Subject: [PATCH] Fixed conflict with X11 Added tmp folder to gitignore

---
 .gitignore                          | 1 +
 rpcs3/Emu/RSX/GL/rsx_gl_texture.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 6eafd788c9..769c3bd59e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,7 @@
 /build
 /bin
 /lib
+/tmp
 /ipch
 /rpcs3/Debug
 /rpcs3/Release
diff --git a/rpcs3/Emu/RSX/GL/rsx_gl_texture.cpp b/rpcs3/Emu/RSX/GL/rsx_gl_texture.cpp
index 217e24d99e..4326be3438 100644
--- 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
 {