From 4b366754716fc4b5d0148de03ee8d9710df1bfdb Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Sun, 12 Jul 2015 05:53:45 +0000
Subject: [PATCH] Merge branch 'master' of github.com:pjreddie/darknet

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

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

--
Gitblit v1.10.0