From: Thomas Pérennou (Viveris Technologie) <thomas.perennou@external.thalesgroup.com>
Date: Tue, 24 Jun 2014 15:03:03 +0000 (+0200)
Subject: Merge tag 'LIV_TRC6500_V2.2.4' into dev_tr65_tpe_864_validrzo_linux
X-Git-Tag: debian_7.5_20141208~71^2~1^2
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=1d7cb2317290d8af3c4238a1a1e4a5c4b5702b8c;hp=06f63bbcb341bf596157c432fcab180f7ffe0a19;p=debian6500.git

Merge tag 'LIV_TRC6500_V2.2.4' into dev_tr65_tpe_864_validrzo_linux

FT863 + minor generation script corrections

Conflicts:
	.gitignore
---

diff --git a/.gitignore b/.gitignore
index b20d04c..5b16382 100644
--- a/.gitignore
+++ b/.gitignore
@@ -140,3 +140,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