Tools

Merge branch 'auxmerge/jrc-merge_glen' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emzarbgle/vecto-aux into Private/AUX_Merge

Conflicts:
	.gitignore
	Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vecto
	Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vecto
	Generic Vehicles/Engineering Mode/24t Coach/24t Coach.veng
	Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vgbx
	Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vveh
	Generic Vehicles/Engineering Mode/24t Coach/Direct Gear.vtlm
	Generic Vehicles/Engineering Mode/24t Coach/Indirect Gear.vtlm
	User Manual/GUI/ENG-Editor.html
	User Manual/GUI/GBX-Editor.html
	User Manual/GUI/VECTO-Editor.html
	User Manual/GUI/VECTO-Editor_Aux.html
	User Manual/GUI/VEH-Editor.html
	User Manual/GUI/index.html
	User Manual/GUI/mainform.html
	User Manual/GUI/settings.html
	User Manual/fileformat/VAUX.html
	User Manual/fileformat/VDRI.html
	User Manual/fileformat/VMOD.html
	User Manual/fileformat/VSUM.html
	User Manual/fileformat/index.html
	User Manual/general/Auxiliaries.html
	User Manual/general/cmd.html
	User Manual/main/changelog.html
	User Manual/main/head.html
	User Manual/main/index.html
	User Manual/main/start.html
	User Manual/usermanual.html
	VECTO.sln
	VECTO/GUI/F_AboutBox.Designer.vb
	VECTO/GUI/F_AboutBox.vb
	VECTO/GUI/F_ENG.Designer.vb
	VECTO/GUI/F_ENG.vb
	VECTO/GUI/F_FLD.Designer.vb
	VECTO/GUI/F_FLD.vb
	VECTO/GUI/F_GBX.Designer.vb
	VECTO/GUI/F_GBX.vb
	VECTO/GUI/F_GBX_GearDlog.Designer.vb
	VECTO/GUI/F_GBX_GearDlog.vb
	VECTO/GUI/F_Graph.vb
	VECTO/GUI/F_JIRA.resx
	VECTO/GUI/F_MAINForm.Designer.vb
	VECTO/GUI/F_MAINForm.resx
	VECTO/GUI/F_MAINForm.vb
	VECTO/GUI/F_Settings.Designer.vb
	VECTO/GUI/F_Settings.vb
	VECTO/GUI/F_VECTO.Designer.vb
	VECTO/GUI/F_VECTO.vb
	VECTO/GUI/F_VEH.Designer.vb
	VECTO/GUI/F_VEH.vb
	VECTO/GUI/F_Welcome.vb
	VECTO/Input Files/cDRI.vb
	VECTO/Input Files/cENG.vb
	VECTO/Input Files/cFLD.vb
	VECTO/Input Files/cGBX.vb
	VECTO/Input Files/cSubPath.vb
	VECTO/Input Files/cVEH.vb
	VECTO/MODcalc/cMOD.vb
	VECTO/MODcalc/cPower.vb
	VECTO/MODcalc/cVh.vb
	VECTO/M_MAIN.vb
	VECTO/My Project/Application.Designer.vb
	VECTO/My Project/AssemblyInfo.vb
	VECTO/My Project/Resources.Designer.vb
	VECTO/My Project/Settings.Designer.vb
	VECTO/VECTO.vbproj
	VECTO/VECTO_Global.vb
	VECTO/VECTO_Types.vb
	VECTO/app.config
	VECTO/cDEV.vb
	VECTO/cDeclaration.vb
	VECTO/cVSUM.vb
	VECTO/packages.config
	packages/repositories.config