From 64eff170f20e1f31950b8311e29fcb26270be734 Mon Sep 17 00:00:00 2001
From: Maijin <maijin21@gmail.com>
Date: Sun, 3 Dec 2017 22:36:56 +0100
Subject: [PATCH] Update .gitignore

---
 .gitignore | 139 +++++++++++++++++++++++++++--------------------------
 1 file changed, 72 insertions(+), 67 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4ed5e2be..e7b5ed2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,70 +1,75 @@
-# The final executable after `make clean`
-
-cutter
-AStyle*
-
-# C++ objects and libs
-
-*.slo
-*.lo
-*.o
-*.a
-*.la
-*.lai
-*.so
-*.dll
-*.dylib
-
-# Qt-es
-
-*.qmake.cache
-*.qmake.stash
-*.pro.user
-*.pro.user.*
-*.qbs.user
-*.qbs.user.*
-*.moc
-moc_*.cpp
-qrc_*.cpp
-moc_*.h
-ui_*.h
-Makefile*
-*build-*
-
-# QtCreator
-
-*.autosave
-
-# QtCtreator Qml
-*.qmlproject.user
-*.qmlproject.user.*
-
-# QtCtreator CMake
-CMakeLists.txt.user
-
-# CLion
-.idea
-
-# Vim
-*.swp
-
-#CMake Files:
-src/*_automoc.cpp
-*CMakeCache.txt*
-*cmake_install.cmake*
-src/CMakeFiles/*
-
-# Visual Studio
-Win32/
-x64/
-*.dir/
-build*/
-release/
-debug/
-*.orig
-/src/*.vcxproj
-/src/*.vcxproj.filters
-/src/cutter_resource.rc
+# The final executable after `make clean`
+
+cutter
+AStyle*
+
+### OSX ###
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# C++ objects and libs
+
+*.slo
+*.lo
+*.o
+*.a
+*.la
+*.lai
+*.so
+*.dll
+*.dylib
+
+# Qt-es
+
+*.qmake.cache
+*.qmake.stash
+*.pro.user
+*.pro.user.*
+*.qbs.user
+*.qbs.user.*
+*.moc
+moc_*.cpp
+qrc_*.cpp
+moc_*.h
+ui_*.h
+Makefile*
+*build-*
+
+# QtCreator
+
+*.autosave
+
+# QtCtreator Qml
+*.qmlproject.user
+*.qmlproject.user.*
+
+# QtCtreator CMake
+CMakeLists.txt.user
+
+# CLion
+.idea
+
+# Vim
+*.swp
+
+#CMake Files:
+src/*_automoc.cpp
+*CMakeCache.txt*
+*cmake_install.cmake*
+src/CMakeFiles/*
+
+# Visual Studio
+Win32/
+x64/
+*.dir/
+build*/
+release/
+debug/
+*.orig
+/src/*.vcxproj
+/src/*.vcxproj.filters
+/src/cutter_resource.rc
 
 #prepare_r2
 meson.py