From 4a42031c0dba948c02f923444bf37b794d4ccf4e Mon Sep 17 00:00:00 2001
From: Tino Hager <tino.hager@nager.at>
Date: Sun, 24 Jun 2018 18:28:12 +0000
Subject: [PATCH] Merge branch 'master' of https://github.com/AlexeyAB/darknet

---
 .gitignore |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7913d67..bbfed65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,21 @@
 *.o
 *.dSYM
 *.csv
+*.out
+*.png
+*.so
+mnist/
+data/
+caffe/
+grasp/
 images/
 opencv/
 convnet/
 decaf/
 submission/
-cnn
+cfg/
+darknet
+.fuse*
 
 # OS Generated #
 .DS_Store*
@@ -14,3 +23,7 @@
 Icon?
 Thumbs.db
 *.swp
+
+# CMake #
+cmake-build-debug/
+CMakeLists.txt

--
Gitblit v1.10.0