aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-01-20 01:32:38 +0100
committerPetr Mrázek <peterix@gmail.com>2014-01-20 01:32:38 +0100
commit222d3c0dc5a8b8a9e93b9368e964cda7becc7f02 (patch)
tree9ab4538f2e80847874a7c9a5c7c2dbc099cb8cae /.gitignore
parent48b587e7b6b96b5c3ac17dc8b67a7b0ab9c2c4f0 (diff)
parent3a3c9ac9515447941d383f2c4fe4b0225fdd8252 (diff)
downloadPrismLauncher-222d3c0dc5a8b8a9e93b9368e964cda7becc7f02.tar.gz
PrismLauncher-222d3c0dc5a8b8a9e93b9368e964cda7becc7f02.tar.bz2
PrismLauncher-222d3c0dc5a8b8a9e93b9368e964cda7becc7f02.zip
Merge branch 'release-0.2'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore14
1 files changed, 10 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 54bd5039..2ef0d673 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,23 @@
Thumbs.db
.kdev4
-MultiMC5.kdev4
-MultiMC.pro.user
-CMakeLists.txt.user
.user
.directory
-build
resources/CMakeFiles
resources/MultiMCLauncher.jar
*~
*.swp
html/
+# Project Files
+MultiMC5.kdev4
+MultiMC.pro.user
+CMakeLists.txt.user
+CMakeLists.txt.user.*
+
+# Build dirs
+build
+/build-*
+
# Ctags File
tags