From 6d56c38e8bcb9041335b03f27c192c24dfaedb1c Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Wed, 28 Mar 2018 23:39:28 +0000
Subject: [PATCH] Merge branch 'master' of github.com:AlexeyAB/darknet

---
 .gitignore |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

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

--
Gitblit v1.10.0