Skip to content
Snippets Groups Projects
Commit 9a40e1b1 authored by Christoph Schwarzmeier's avatar Christoph Schwarzmeier
Browse files

Merge branch 'update_gitignore' into 'master'

Add /.idea to .gitignore

See merge request walberla/walberla!200
parents 85c2a7e2 e6ccbecb
Branches
Tags
No related merge requests found
...@@ -4,26 +4,33 @@ ui_* ...@@ -4,26 +4,33 @@ ui_*
qrc_* qrc_*
*~ *~
# macOS # macOS
**/.DS_Store **/.DS_Store
# Backup files of kate/kwrite
# Generated files # Generated files
*.out *.out
/src/waLBerlaDefinitions.h /src/waLBerlaDefinitions.h
/src/core/waLBerlaBuildInfo.cpp /src/core/waLBerlaBuildInfo.cpp
# Eclipse # Eclipse
/.cproject /.cproject
/.project /.project
/.pydevproject /.pydevproject
/.settings /.settings
# Visual Studio # Visual Studio
/CMakeSettings.json /CMakeSettings.json
/.vs /.vs
# CLion
*.idea
# Binary Files # Binary Files
/bin/ /bin/
/lib/ /lib/
...@@ -39,16 +46,12 @@ logfile*.txt ...@@ -39,16 +46,12 @@ logfile*.txt
# Compiled python # Compiled python
*.pyc *.pyc
# Blockforest saves # Blockforest saves
*.sav *.sav
/utilities/.idea # CMake
/utilities/py_waLBerla/.idea
/python/.idea
/src/stencil/.idea
/CMakeLists.txt.user /CMakeLists.txt.user
# CMake build files # CMake build files
...@@ -60,4 +63,4 @@ CTestTestfile.cmake ...@@ -60,4 +63,4 @@ CTestTestfile.cmake
cmake_install.cmake cmake_install.cmake
CMakeDefs.h CMakeDefs.h
/moduleStatistics.json /moduleStatistics.json
/walberla-config.cmake /walberla-config.cmake
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment