X-Git-Url: https://secure.softndesign.org/git/?a=blobdiff_plain;f=.gitignore;h=93cfeff1451161777fcb0ac6b741195ac11a49b4;hb=21331d9a98591e5712c7f4fd84cf1065fb32427a;hp=3da2e813a76849181c43c169fa589d9d8d3d0c06;hpb=4e802319aadcac41890580ba80beb7b9139e07da;p=debian6500.git

diff --git a/.gitignore b/.gitignore
index 3da2e81..93cfeff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,91 +1,20 @@
-.sconsign.dblite
-prod
-prod_rhp*
+#####################################################################
+# Temp/IDE generated files
+#####################################################################
 *~
 *.contrib*
 *.keep
+*.merge
 *.pyc
 *.o
 *.os
-
-dev/*mccm_generated
-dev/modele/implementation/trc6500_chaine_*/*/gcc_debian_tao
-dev/modele/implementation/trc6500_chaine_*/*/mccm_generated
-dev/modele/implementation/trc6500_chaine_gon/Lsu/libserveur_lsu_config.a
-dev/modele/implementation/trc6500_testu/trc6500_simu_df/*/gcc_debian_tao
-dev/modele/implementation/trc6500_testu/trc6500_simu_df/*/mccm_generated
-dev/modele/implementation/trc6500_testu/trc6500_simu_soi/*/gcc_debian_tao
-dev/modele/implementation/trc6500_testu/trc6500_simu_soi/*/mccm_generated
-dev/modele/implementation_bouchon/trc6500_chaine_*/*/gcc_debian_tao
-dev/modele/implementation_bouchon/trc6500_chaine_*/*/mccm_generated
-
-#symbolic links
-dev/code_metier/monitoring/cfg/*.xml
-
-dev/common/libfe306/inc
-dev/common/libfe306/src
-
-dev/tools/conversions/bin2sig/src/erreur.c
-dev/tools/conversions/bin2sig/src/file_118.c
-dev/tools/conversions/bin2sig/src/outils.c
-dev/tools/conversions/bin2sig/src/signaux.c
-dev/tools/conversions/dfe2sig/src/erreur.c
-dev/tools/conversions/dfe2sig/src/file_118.c
-dev/tools/conversions/dfe2sig/src/outils.c
-dev/tools/conversions/dfe2sig/src/signaux.c
-
-dev/tools/sim_multicast/sim_multicast/src/CUdpSocket.cpp
-dev/tools/sim_multicast/sim_multicast/src/erreur.c
-dev/tools/sim_multicast/sim_multicast/src/file_118.c
-dev/tools/sim_multicast/sim_multicast/src/freq_plan_common.c
-dev/tools/sim_multicast/sim_multicast/src/outils.c
-dev/tools/sim_multicast/sim_multicast/src/signaux.c
-
-dev/tools/sniffers/sniffer_suivi_soi/CUdpSocket.cpp
-dev/tools/sniffers/sniffer_suivi_soi/Exception.cpp
-dev/tools/sniffers/sniffer_suivi_soi/HtoN.cpp
-dev/tools/sniffers/sniffer_suivi_soi/NtoH.cpp
-
-dev/common/libspe/trt/libsignl/inc
-dev/common/libspe/trt/libsignl/src
-
-dev/common/libspe/spe/cfg/*.xml
-
-dev/common/libspe/trt/ac/inc
-
-dev/common/libspe/trt/common/src/*.c
-
-dev/common/libspe/trt/ic/inc/proto_ic.h
-dev/common/libspe/trt/ic/src/*.c
-dev/common/libspe/trt/ic/inc/i_alis/i_alis.h
-dev/common/libspe/trt/ic/src/i_alis/i_alis.c
-
-dev/common/libspe/trt/common/inc/*.h
-dev/common/libspe/trt/libcode/inc
-dev/common/libspe/trt/libcode/src
-
-dev/common/libspe/trt/analyse/inc
-dev/common/libspe/trt/analyse/recocod/recocod.cfg
-
-dev/common/libspe/trt/analyse/recomod/inc/identification
-dev/common/libspe/trt/analyse/recomod/inc/proto_rm.h
-dev/common/libspe/trt/analyse/recomod/inc/acars/*.h
-dev/common/libspe/trt/analyse/recomod/inc/recomod
-dev/common/libspe/trt/analyse/recomod/src/recomod
-dev/common/libspe/trt/analyse/recomod/src/rec_modt.c
-dev/common/libspe/trt/analyse/recomod/src/acars/demo_acars.c
-dev/common/libspe/trt/analyse/recomod/src/identification/*.c
-
-dev/common/libspe/trt/ac/src/c_*.c
-
-dev/common/libspe/trt/sp/inc/*.h
-dev/common/libspe/trt/sp/inc/p_alis/p_*.h
-dev/common/libspe/trt/sp/inc/p_rds/*.h
-dev/common/libspe/trt/sp/src/*.c
-dev/common/libspe/trt/sp/src/p_alis/p_*.c
-dev/common/libspe/trt/sp/src/p_alis/p_*.c
-dev/common/libspe/trt/sp/src/p_rds/p_*.c
-
-dev/common/libspe/trt/md/inc/*.h
-dev/common/libspe/trt/md/src/dem_*.c
-dev/common/libspe/trt/md/src/cag_phonie.c
+.*project
+.settings
+*.iso
+trc6500-master-file_*.deb
+simple-cdd/build.log
+simple-cdd/dists/
+simple-cdd/images/
+
+trc6500-master-file/deb
+master/etc/trc6500_os_version