ajout marques spéciales blanches sans topshp
buoyages evolutions
Balisage compléments
Merge origin/master

Conflicts:
	navisu-launcher/data/shp/shp_0/ACHARE.dbf
	navisu-launcher/data/shp/shp_0/ACHARE.shp
	navisu-launcher/data/shp/shp_0/ACHARE.shx
	navisu-launcher/data/shp/shp_0/AIRARE.dbf
	navisu-launcher/data/shp/shp_0/AIRARE.shp
	navisu-launcher/data/shp/shp_0/AIRARE.shx
	navisu-launcher/data/shp/shp_0/BCNCAR.dbf
	navisu-launcher/data/shp/shp_0/BCNCAR.shp
	navisu-launcher/data/shp/shp_0/BCNCAR.shx
	navisu-launcher/data/shp/shp_0/BCNISD.dbf
	navisu-launcher/data/shp/shp_0/BCNISD.shp
	navisu-launcher/data/shp/shp_0/BCNISD.shx
	navisu-launcher/data/shp/shp_0/BCNLAT.dbf
	navisu-launcher/data/shp/shp_0/BCNLAT.shp
	navisu-launcher/data/shp/shp_0/BCNLAT.shx
	navisu-launcher/data/shp/shp_0/BCNSPP.dbf
	navisu-launcher/data/shp/shp_0/BCNSPP.shp
	navisu-launcher/data/shp/shp_0/BCNSPP.shx
	navisu-launcher/data/shp/shp_0/BOYCAR.dbf
	navisu-launcher/data/shp/shp_0/BOYCAR.shp
	navisu-launcher/data/shp/shp_0/BOYCAR.shx
	navisu-launcher/data/shp/shp_0/BOYISD.dbf
	navisu-launcher/data/shp/shp_0/BOYISD.shp
	navisu-launcher/data/shp/shp_0/BOYISD.shx
	navisu-launcher/data/shp/shp_0/BOYLAT.dbf
	navisu-launcher/data/shp/shp_0/BOYLAT.shp
	navisu-launcher/data/shp/shp_0/BOYLAT.shx
	navisu-launcher/data/shp/shp_0/BOYSAW.dbf
	navisu-launcher/data/shp/shp_0/BOYSAW.shp
	navisu-launcher/data/shp/shp_0/BOYSAW.shx
	navisu-launcher/data/shp/shp_0/BOYSPP.dbf
	navisu-launcher/data/shp/shp_0/BOYSPP.shp
	navisu-launcher/data/shp/shp_0/BOYSPP.shx
	navisu-launcher/data/shp/shp_0/BRIDGE.dbf
	navisu-launcher/data/shp/shp_0/BRIDGE.shp
	navisu-launcher/data/shp/shp_0/BRIDGE.shx
	navisu-launcher/data/shp/shp_0/BUAARE.dbf
	navisu-launcher/data/shp/shp_0/BUAARE.shp
	navisu-launcher/data/shp/shp_0/BUAARE.shx
	navisu-launcher/data/shp/shp_0/BUISGL.dbf
	navisu-launcher/data/shp/shp_0/BUISGL.shp
	navisu-launcher/data/shp/shp_0/BUISGL.shx
	navisu-launcher/data/shp/shp_0/CBLARE.dbf
	navisu-launcher/data/shp/shp_0/CBLARE.shp
	navisu-launcher/data/shp/shp_0/CBLARE.shx
	navisu-launcher/data/shp/shp_0/CBLSUB.dbf
	navisu-launcher/data/shp/shp_0/CBLSUB.shp
	navisu-launcher/data/shp/shp_0/CBLSUB.shx
	navisu-launcher/data/shp/shp_0/CGUSTA.dbf
	navisu-launcher/data/shp/shp_0/CGUSTA.shp
	navisu-launcher/data/shp/shp_0/CGUSTA.shx
	navisu-launcher/data/shp/shp_0/COALNE.dbf
	navisu-launcher/data/shp/shp_0/COALNE.shp
	navisu-launcher/data/shp/shp_0/COALNE.shx
	navisu-launcher/data/shp/shp_0/CTNARE.dbf
	navisu-launcher/data/shp/shp_0/CTNARE.shp
	navisu-launcher/data/shp/shp_0/CTNARE.shx
	navisu-launcher/data/shp/shp_0/C_AGGR.dbf
	navisu-launcher/data/shp/shp_0/DAYMAR.dbf
	navisu-launcher/data/shp/shp_0/DAYMAR.shp
	navisu-launcher/data/shp/shp_0/DAYMAR.shx
	navisu-launcher/data/shp/shp_0/DEPARE.dbf
	navisu-launcher/data/shp/shp_0/DEPARE.shp
	navisu-launcher/data/shp/shp_0/DEPARE.shx
	navisu-launcher/data/shp/shp_0/DEPCNT.dbf
	navisu-launcher/data/shp/shp_0/DEPCNT.shp
	navisu-launcher/data/shp/shp_0/DEPCNT.shx
	navisu-launcher/data/shp/shp_0/DMPGRD.dbf
	navisu-launcher/data/shp/shp_0/DMPGRD.shp
	navisu-launcher/data/shp/shp_0/DMPGRD.shx
	navisu-launcher/data/shp/shp_0/DSID.dbf
	navisu-launcher/data/shp/shp_0/FAIRWY.dbf
	navisu-launcher/data/shp/shp_0/FAIRWY.shp
	navisu-launcher/data/shp/shp_0/FAIRWY.shx
	navisu-launcher/data/shp/shp_0/FOGSIG.dbf
	navisu-launcher/data/shp/shp_0/FOGSIG.shp
	navisu-launcher/data/shp/shp_0/FOGSIG.shx
	navisu-launcher/data/shp/shp_0/FORSTC.dbf
	navisu-launcher/data/shp/shp_0/FORSTC.shp
	navisu-launcher/data/shp/shp_0/FORSTC.shx
	navisu-launcher/data/shp/shp_0/HRBFAC.dbf
	navisu-launcher/data/shp/shp_0/HRBFAC.shp
	navisu-launcher/data/shp/shp_0/HRBFAC.shx
	navisu-launcher/data/shp/shp_0/LAKARE.dbf
	navisu-launcher/data/shp/shp_0/LAKARE.shp
	navisu-launcher/data/shp/shp_0/LAKARE.shx
	navisu-launcher/data/shp/shp_0/LIGHTS.dbf
	navisu-launcher/data/shp/shp_0/LIGHTS.shp
	navisu-launcher/data/shp/shp_0/LIGHTS.shx
	navisu-launcher/data/shp/shp_0/LNDARE.dbf
	navisu-launcher/data/shp/shp_0/LNDARE.shp
	navisu-launcher/data/shp/shp_0/LNDARE.shx
	navisu-launcher/data/shp/shp_0/LNDELV.dbf
	navisu-launcher/data/shp/shp_0/LNDELV.shp
	navisu-launcher/data/shp/shp_0/LNDELV.shx
	navisu-launcher/data/shp/shp_0/LNDMRK.dbf
	navisu-launcher/data/shp/shp_0/LNDMRK.shp
	navisu-launcher/data/shp/shp_0/LNDMRK.shx
	navisu-launcher/data/shp/shp_0/LNDRGN.dbf
	navisu-launcher/data/shp/shp_0/LNDRGN.shp
	navisu-launcher/data/shp/shp_0/LNDRGN.shx
	navisu-launcher/data/shp/shp_0/MAGVAR.dbf
	navisu-launcher/data/shp/shp_0/MAGVAR.shp
	navisu-launcher/data/shp/shp_0/MAGVAR.shx
	navisu-launcher/data/shp/shp_0/MARCUL.dbf
	navisu-launcher/data/shp/shp_0/MARCUL.shp
	navisu-launcher/data/shp/shp_0/MARCUL.shx
	navisu-launcher/data/shp/shp_0/M_COVR.dbf
	navisu-launcher/data/shp/shp_0/M_COVR.shp
	navisu-launcher/data/shp/shp_0/M_COVR.shx
	navisu-launcher/data/shp/shp_0/M_NSYS.dbf
	navisu-launcher/data/shp/shp_0/M_NSYS.shp
	navisu-launcher/data/shp/shp_0/M_NSYS.shx
	navisu-launcher/data/shp/shp_0/M_QUAL.dbf
	navisu-launcher/data/shp/shp_0/M_QUAL.shp
	navisu-launcher/data/shp/shp_0/M_QUAL.shx
	navisu-launcher/data/shp/shp_0/M_SREL.dbf
	navisu-launcher/data/shp/shp_0/M_SREL.shp
	navisu-launcher/data/shp/shp_0/M_SREL.shx
	navisu-launcher/data/shp/shp_0/NAVLNE.dbf
	navisu-launcher/data/shp/shp_0/NAVLNE.shp
	navisu-launcher/data/shp/shp_0/NAVLNE.shx
	navisu-launcher/data/shp/shp_0/OBSTRN.dbf
	navisu-launcher/data/shp/shp_0/OBSTRN.shp
	navisu-launcher/data/shp/shp_0/OBSTRN.shx
	navisu-launcher/data/shp/shp_0/PILBOP.dbf
	navisu-launcher/data/shp/shp_0/PILBOP.shp
	navisu-launcher/data/shp/shp_0/PILBOP.shx
	navisu-launcher/data/shp/shp_0/PONTON.dbf
	navisu-launcher/data/shp/shp_0/PONTON.shp
	navisu-launcher/data/shp/shp_0/PONTON.shx
	navisu-launcher/data/shp/shp_0/RECTRC.dbf
	navisu-launcher/data/shp/shp_0/RECTRC.shp
	navisu-launcher/data/shp/shp_0/RECTRC.shx
	navisu-launcher/data/shp/shp_0/RESARE.dbf
	navisu-launcher/data/shp/shp_0/RESARE.shp
	navisu-launcher/data/shp/shp_0/RESARE.shx
	navisu-launcher/data/shp/shp_0/RIVERS.dbf
	navisu-launcher/data/shp/shp_0/RIVERS.shp
	navisu-launcher/data/shp/shp_0/RIVERS.shx
	navisu-launcher/data/shp/shp_0/RSCSTA.dbf
	navisu-launcher/data/shp/shp_0/RSCSTA.shp
	navisu-launcher/data/shp/shp_0/RSCSTA.shx
	navisu-launcher/data/shp/shp_0/SBDARE.dbf
	navisu-launcher/data/shp/shp_0/SBDARE.shp
	navisu-launcher/data/shp/shp_0/SBDARE.shx
	navisu-launcher/data/shp/shp_0/SEAARE.dbf
	navisu-launcher/data/shp/shp_0/SEAARE.shp
	navisu-launcher/data/shp/shp_0/SEAARE.shx
	navisu-launcher/data/shp/shp_0/SILTNK.dbf
	navisu-launcher/data/shp/shp_0/SILTNK.shp
	navisu-launcher/data/shp/shp_0/SILTNK.shx
	navisu-launcher/data/shp/shp_0/SLCONS.dbf
	navisu-launcher/data/shp/shp_0/SLCONS.shp
	navisu-launcher/data/shp/shp_0/SLCONS.shx
	navisu-launcher/data/shp/shp_0/SLOGRD.dbf
	navisu-launcher/data/shp/shp_0/SLOGRD.shp
	navisu-launcher/data/shp/shp_0/SLOGRD.shx
	navisu-launcher/data/shp/shp_0/SOUNDG.dbf
	navisu-launcher/data/shp/shp_0/SOUNDG.shp
	navisu-launcher/data/shp/shp_0/SOUNDG.shx
	navisu-launcher/data/shp/shp_0/TOPMAR.dbf
	navisu-launcher/data/shp/shp_0/TOPMAR.shp
	navisu-launcher/data/shp/shp_0/TOPMAR.shx
	navisu-launcher/data/shp/shp_0/TS_PAD.dbf
	navisu-launcher/data/shp/shp_0/TS_PAD.shp
	navisu-launcher/data/shp/shp_0/TS_PAD.shx
	navisu-launcher/data/shp/shp_0/UWTROC.dbf
	navisu-launcher/data/shp/shp_0/UWTROC.shp
	navisu-launcher/data/shp/shp_0/UWTROC.shx
	navisu-launcher/data/shp/shp_0/WATTUR.dbf
	navisu-launcher/data/shp/shp_0/WATTUR.shp
	navisu-launcher/data/shp/shp_0/WATTUR.shx
	navisu-launcher/data/shp/shp_0/WRECKS.dbf
	navisu-launcher/data/shp/shp_0/WRECKS.shp
	navisu-launcher/data/shp/shp_0/WRECKS.shx
	navisu-launcher/errors.txt
Balisage compléments
Balisage compléments
Balisage compléments
commit après pull
commit après activation tests HUD