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 b20d04cfee468692b40b5ffbf0dfc498a01fd4c4..5b16382834d10bfe74365446cde3f127f082cb6a 100644 (file)
--- 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