From: Shane Synan <digitalcircuit36939@gmail.com>
Date: Fri, 20 May 2016 06:42:37 +0000 (-0400)
Subject: Exclude Qt Creator user settings from repository
X-Git-Tag: 0.12.5~114
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=5322f6fa00c78228c2dc298ce6d3358bdd8fcaf2

Exclude Qt Creator user settings from repository

Add 'CMakeLists.txt.user' to .gitignore to ignore Qt Creator's project
settings.  If needed, it can easily be generated by opening
CMakeLists.txt with Qt Creator.

(cherry picked from commit b163ae76ce6d064942854e1415a4ee0e495adec8)
---

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