summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorFulup Ar Foll <fulup@iot.bzh>2016-02-17 14:41:07 +0100
committerFulup Ar Foll <fulup@iot.bzh>2016-02-17 14:41:07 +0100
commit3da6e9fad4c6788098cf425369fb3d7860cb824f (patch)
tree95751052d331a35162c242a4c2d2f177a9b7ada0 /.gitignore
parent6d0846d769256e74a3f403fc0e5965e2d227b324 (diff)
parentfcfb3c0951b6e2e06e7bf282e867576d8abb00c4 (diff)
Merge origin/master
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 6f88c4eb..d15108fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,6 @@ dist/*
CMakeFiles/
CMakeCache.txt
nbproject/private/*
+Makefile
+cmake_install.cmake
+*.so