Merge tag 'LIV_TRC6500_V2.2.4' into dev_tr65_tpe_864_validrzo_linux
authorThomas Pérennou (Viveris Technologie) <thomas.perennou@external.thalesgroup.com>
Tue, 24 Jun 2014 15:03:03 +0000 (17:03 +0200)
committerThomas Pérennou (Viveris Technologie) <thomas.perennou@external.thalesgroup.com>
Tue, 24 Jun 2014 15:03:03 +0000 (17:03 +0200)
FT863 + minor generation script corrections

Conflicts:
.gitignore

1  2 
.gitignore

diff --cc .gitignore
index ec19bdf031948912a2c48dcd7446de3915ee9638,b20d04cfee468692b40b5ffbf0dfc498a01fd4c4..5b16382834d10bfe74365446cde3f127f082cb6a
@@@ -139,3 -140,3 +140,15 @@@ dev/common/libspe/trt/md/inc/cag_phonie
  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