From a0a2e6b50096c92de8cea2eba32a71537bc5f2c8 Mon Sep 17 00:00:00 2001
From: Edmond Yoo <hj3yoo@uwaterloo.ca>
Date: Sun, 16 Sep 2018 03:15:34 +0000
Subject: [PATCH] Merge branch 'master' of https://github.com/hj3yoo/darknet

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

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

--
Gitblit v1.10.0