X-Git-Url: https://secure.softndesign.org/git/?a=blobdiff_plain;f=.gitignore;h=87a360b8f81bc16a7c6d47e0976a96e2969866a1;hb=3db33d420266c30a058d2a22b2a4d7d74cfe5c98;hp=b20d04cfee468692b40b5ffbf0dfc498a01fd4c4;hpb=06f63bbcb341bf596157c432fcab180f7ffe0a19;p=debian6500.git

diff --git a/.gitignore b/.gitignore
index b20d04c..87a360b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@ prod_rhp*
 *~
 *.contrib*
 *.keep
+*.orig
+*.merge
 *.pyc
 *.o
 *.os
@@ -140,3 +142,15 @@ dev/common/libspe/trt/md/inc/cag_phonie.h
 dev/common/libspe/trt/md/src/cag_phonie.c
 dev/common/libspe/trt/md/src/dem_*.c
 
+#####################################################################
+# Java build directories
+#####################################################################
+dev/common/java/*/bin
+dev/common/java/*/build
+dev/common/java/*/generated
+dev/cots/java/*/bin
+dev/cots/java/*/build
+dev/cots/java/*/generated
+dev/tools/valid_rzo/bin
+dev/tools/valid_rzo/build
+dev/tools/valid_rzo/generated