From f0abcfa02b2094396f955c743f7f11fcdb2e3d13 Mon Sep 17 00:00:00 2001
From: IlyaOvodov <b@ovdv.ru>
Date: Mon, 04 Jun 2018 15:57:15 +0000
Subject: [PATCH] Merge branch 'master' of https://github.com/AlexeyAB/darknet into Fix_get_color_depth

---
 .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