From b8eb8b0a4016232c8da95c26501ac60ea9491901 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 02 Sep 2016 00:26:12 +0000
Subject: [PATCH] Merge branch 'master' of github.com:pjreddie/darknet

---
 .gitignore |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9153fbb..fd44ca2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,20 @@
 *.o
 *.dSYM
 *.csv
+*.out
+*.png
+mnist/
+data/
+caffe/
+grasp/
 images/
 opencv/
 convnet/
 decaf/
-cnn
+submission/
+cfg/
+darknet
+.fuse*
 
 # OS Generated #
 .DS_Store*

--
Gitblit v1.10.0