From d415df7ea26c0424abf8df9797fb1c4467c62d12 Mon Sep 17 00:00:00 2001
From: Blood-Asp <bloodasphendrik@gmail.com>
Date: Wed, 9 Dec 2015 00:52:00 +0100
Subject: merge of GT5.09 fixes into 5.08 branch

---
 .gitignore | 5 +++++
 1 file changed, 5 insertions(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 3187928dd8..94ef901ebb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ thumbs.db
 *.jar
 *.war
 *.ear
+*.txt
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
@@ -32,6 +33,7 @@ tmp/
 local.properties
 .settings/
 .loadpath
+/eclipse
 
 # Eclipse Core
 .project
@@ -70,3 +72,6 @@ local.properties
 .idea_modules/
 
 /out/
+gradle/wrapper/gradle-wrapper.properties
+gradlew
+gradlew.bat
\ No newline at end of file
-- 
cgit