From: Janne Koschinski <janne@kuschku.de>
Date: Fri, 17 Mar 2017 17:34:26 +0000 (+0100)
Subject: Updated gitignore to ignore files generated by JetBrains IDEs
X-Git-Tag: 0.12.5~31
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=f01a036da01cb34880e68f7cdf2da81efc223ef8

Updated gitignore to ignore files generated by JetBrains IDEs

Resolves GH-280.

(cherry picked from commit 46be0fab5db8f96a37d9e0f35251c64169c8751d)
---

diff --git a/.gitignore b/.gitignore
index ded1e431..8a2a0ded 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 build*
 *.pyc
 tags
+/.idea
+/cmake-build-*
 
 # Qt Creator configuration
 CMakeLists.txt.user