From 3a335c23b6a7c09c65fee9d9a841cf5832fc6a84 Mon Sep 17 00:00:00 2001
From: Tod Beardsley <todb@metasploit.com>
Date: Mon, 8 Apr 2013 21:52:35 -0500
Subject: [PATCH] Replacing with master's .gitignore

---
 java/_root/.gitignore | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/java/_root/.gitignore b/java/_root/.gitignore
index 8979a6ab..5f89c2b0 100644
--- a/java/_root/.gitignore
+++ b/java/_root/.gitignore
@@ -1,3 +1,4 @@
+.bundle
 # Rubymine project directory
 .idea
 # RVM control file
@@ -6,24 +7,22 @@
 .yardoc
 # Mac OS X files
 .DS_Store
+# database config for testing
+config/database.yml
 # simplecov coverage data
 coverage
 data/meterpreter/ext_server_pivot.dll
 data/meterpreter/ext_server_pivot.x64.dll
-doc
-external/source/javapayload/*/.classpath
-external/source/javapayload/*/.project
-external/source/javapayload/*/.settings
-external/source/javapayload/*/bin
-external/source/javapayload/*/target
-external/source/javapayload/*/*/.classpath
-external/source/javapayload/*/*/.project
-external/source/javapayload/*/*/.settings
-external/source/javapayload/*/*/bin
-external/source/javapayload/*/*/target
+doc/
+external/source/meterpreter/java/bin
+external/source/meterpreter/java/build
+external/source/meterpreter/java/extensions
+external/source/javapayload/bin
+external/source/javapayload/build
 # Packaging directory
 pkg
 tags
 *.swp
 *.orig
 *.rej
+*~