From a4485b8a6656c2a2fa0b78ca7c035523c8149b8c Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 10 Jun 2015 15:49:25 +0000
Subject: [PATCH] Merge branch 'master' of pjreddie.com:jnet

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

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

--
Gitblit v1.10.0