From 393eaec1600a434e4496b3a11e08c38da5858377 Mon Sep 17 00:00:00 2001
From: Tino Hager <tino.hager@nager.at>
Date: Wed, 27 Jun 2018 21:46:41 +0000
Subject: [PATCH] Merge branch 'master' of https://github.com/AlexeyAB/darknet

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

diff --git a/.gitignore b/.gitignore
index 12d2c99..1bd67d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,13 +2,21 @@
 *.dSYM
 *.csv
 *.out
+*.png
+*.so
 mnist/
+data/
+caffe/
+grasp/
 images/
 opencv/
 convnet/
 decaf/
 submission/
-darknet
+cfg/
+build/darknet/*
+!build/darknet/YoloWrapper.cs
+.fuse*
 
 # OS Generated #
 .DS_Store*
@@ -16,3 +24,7 @@
 Icon?
 Thumbs.db
 *.swp
+
+# CMake #
+cmake-build-debug/
+CMakeLists.txt

--
Gitblit v1.10.0