Add .user files to gitignore and remove deleted files from CMakeLists.

Forkk · Jan 25, 2013 · 8926b24 · 8926b24
1 parent f5ee069
commit 8926b24
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 241 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,9 @@
 Thumbs.db
 .kdev4
 MultiMC5.kdev4
+MultiMC.pro.user
+CMakeLists.txt.user
+.user
 build
 resources/CMakeFiles
 resources/MultiMCLauncher.jar
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -127,8 +127,6 @@ data/inifile.h
 data/instancebase.h
 data/instancemodel.h
 data/settingsbase.h
-data/settingsmacros.h
-data/settingsmacrosundef.h
 data/stdinstance.h
 
 util/pathutils.h

diff --git a/MultiMC.pro.user b/MultiMC.pro.user