From e0aa92b017a8d5602ce8b43f6e240ab42a25fac4 Mon Sep 17 00:00:00 2001
From: Bryan Hoyle <starfoxprime@gmail.com>
Date: Fri, 16 Nov 2012 16:51:37 -0500
Subject: [PATCH] oops, removing mniip's branch, I added in an others folder by
 accident

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index ff267553a..e5302cfcb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,4 +50,5 @@ config.log
 *.gch
 *.pyc
 site_scons/site_tools/mfprogram/*.pyc
-site_scons/site_tools/gch/*.pyc
\ No newline at end of file
+site_scons/site_tools/gch/*.pyc
+others/*