From eb98da5000f4d347ee8563467dffa4541e7faa7a Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Tue, 11 Aug 2015 06:22:54 +0000
Subject: [PATCH] Merge branch 'master' of github.com:pjreddie/darknet

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

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

--
Gitblit v1.10.0