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 |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index fd44ca2..1bd67d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.csv
 *.out
 *.png
+*.so
 mnist/
 data/
 caffe/
@@ -13,7 +14,8 @@
 decaf/
 submission/
 cfg/
-darknet
+build/darknet/*
+!build/darknet/YoloWrapper.cs
 .fuse*
 
 # OS Generated #
@@ -22,3 +24,7 @@
 Icon?
 Thumbs.db
 *.swp
+
+# CMake #
+cmake-build-debug/
+CMakeLists.txt

--
Gitblit v1.10.0