Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Forked from VECTO / VECTO Sim
8706 commits behind the upstream repository.
  • Markus Quaritsch's avatar
    ad1c963c
    Merge branch 'auxmerge/jrc-merge_glen' of... · ad1c963c
    Markus Quaritsch authored
    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
    ad1c963c
    History
    Merge branch 'auxmerge/jrc-merge_glen' of...
    Markus Quaritsch authored
    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
Code owners
Assign users and groups as approvers for specific file changes. Learn more.
.gitignore 2.80 KiB
VECTO/bin/
VECTO/obj/

## From github on 15/5/2014: https://github.com/github/gitignore/blob/master/VisualStudio.gitignore

## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.sln.docstates

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
build/
bld/
[Bb]in/
[Oo]bj/

# Roslyn cache directories
*.ide/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

#NUNIT
*.VisualState.xml
TestResult.xml

# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c

*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.svclog
*.scc

# Chutzpah Test files
_Chutzpah*

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf
*.cachefile

# Visual Studio profiler
*.psess
*.vsp
*.vspx

# TFS 2012 Local Workspace
$tf/

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user

# JustCode is a .NET coding addin-in
.JustCode

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover

# NCrunch
_NCrunch_*
.*crunch*.local.xml

# MightyMoose
*.mm.*
AutoTest.Net/

# Web workbench (sass)
.sass-cache/

# Installshield output folder
[Ee]xpress/

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish/

# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
## TODO: Comment the next line if you want to checkin your
## web deploy settings but do note that will include unencrypted
## passwords
*.pubxml

# NuGet Packages Directory
packages/*
## TODO: If the tool you use requires repositories.config
## uncomment the next line
#!packages/repositories.config

# Enable "build/" folder in the NuGet Packages folder since
# NuGet packages use it for MSBuild targets.
# This line needs to be after the ignore of the build folder
# (and the packages folder if the line above has been uncommented)
!packages/build/

# Windows Azure Build Output
csx/
*.build.csdef

# Windows Store app package directory
AppPackages/

# Others
sql/
*.Cache
ClientBin/
[Ss]tyle[Cc]op.*
~
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.pfx
*.publishsettings
node_modules/

# RIA/Silverlight projects
Generated_Code/

# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm

# SQL Server files
*.mdf
*.ldf

# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings

# Microsoft Fakes
FakesAssemblies/
*.orig