From 3b3af3820be19d607109877e2d859102fa174662 Mon Sep 17 00:00:00 2001
From: Naimdjon Takhirov <naimdjon@gmail.com>
Date: Tue, 16 Jun 2015 10:27:47 +0200
Subject: [PATCH 1/2] addded .gitignore

---
 .gitignore | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000000..b6f2a9e42ff
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,58 @@
+# Created by .ignore support plugin (hsz.mobi)
+### Java template
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+
+### Eclipse template
+*.pydevproject
+.metadata
+.gradle
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+
+# Eclipse Core
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+.texlipse
+
+

From c521a4e8aa282b1fc18e62657a68bca30acfa099 Mon Sep 17 00:00:00 2001
From: Naimdjon Takhirov <naimdjon@gmail.com>
Date: Thu, 31 Dec 2015 01:01:23 +0100
Subject: [PATCH 2/2] Adjusted .gitignore to jmeter

---
 .gitignore | 35 ++++++++---------------------------
 1 file changed, 8 insertions(+), 27 deletions(-)

diff --git a/.gitignore b/.gitignore
index b6f2a9e42ff..fe1a5771a7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,4 @@
-# Created by .ignore support plugin (hsz.mobi)
-### Java template
 *.class
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
 *.jar
 *.war
 *.ear
@@ -14,8 +7,7 @@
 hs_err_pid*
 
 
-### Eclipse template
-*.pydevproject
+### Eclipse
 .metadata
 .gradle
 bin/
@@ -31,28 +23,17 @@ local.properties
 # Eclipse Core
 .project
 
-# External tool builders
-.externalToolBuilders/
-
 # Locally stored "Eclipse launch configurations"
 *.launch
 
-# CDT-specific
-.cproject
-
 # JDT-specific (Eclipse Java Development Tools)
 .classpath
 
-# Java annotation processor (APT)
-.factorypath
-
-# PDT-specific
-.buildpath
-
-# sbteclipse plugin
 .target
-
-# TeXlipse plugin
-.texlipse
-
-
+### idea related stuff
+*.iml
+*.ipr
+.idea
+out
+build
+backups