From: Thomas Pietrzak <thomas.pietrzak@gmail.com>
Date: Sun, 23 Sep 2018 14:30:08 +0000 (+0200)
Subject: merge
X-Git-Url: https://git.thomaspietrzak.com/?a=commitdiff_plain;h=a6e3707b12b8b16af693bb7ce333e91e324d72e2;p=tactonlibrary.git

merge
---

a6e3707b12b8b16af693bb7ce333e91e324d72e2
diff --cc .gitignore
index efd36bc,259148f..cbe4e48
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,32 +1,35 @@@
- *.o
 +*.user
 +
+ # Prerequisites
+ *.d
+ 
+ # Compiled Object files
+ *.slo
+ *.lo
+ *.o
+ *.obj
+ 
+ # Precompiled Headers
+ *.gch
+ *.pch
+ 
+ # Compiled Dynamic libraries
+ *.so
+ *.dylib
+ *.dll
+ 
+ # Fortran module files
+ *.mod
+ *.smod
+ 
+ # Compiled Static libraries
+ *.lai
+ *.la
+ *.a
+ *.lib
+ 
+ # Executables
+ *.exe
+ *.out
+ *.app
++