Merge Ricardo's initial-VECTO-core with forked point 'milestones/2.0.4-beta'.
+ All conflicts replaced with `2/0/4-beta`, apart from .sln & .vbproj. + Synthesize next artifical commit with RIcardo's changes on original VECTO-core. # Conflicts: # .gitignore # VECTO.sln # VECTO/GUI/F_MAINForm.vb # VECTO/GUI/F_VECTO.vb # VECTO/GUI/F_VEH_AuxDlog.Designer.vb # VECTO/GUI/F_VEH_AuxDlog.resx # VECTO/GUI/F_VEH_AuxDlog.vb # VECTO/Input Files/cVECTO.vb # VECTO/VECTO.vbproj
No related branches found
No related tags found
Showing
- .gitignore 2 additions, 1 deletion.gitignore
- .hgignore 32 additions, 0 deletions.hgignore
- .hgtags 18 additions, 0 deletions.hgtags
- CHANGES.md 193 additions, 0 deletionsCHANGES.md
- Declaration/DefaultTC.vtcc 12 additions, 0 deletionsDeclaration/DefaultTC.vtcc
- Declaration/MissionCycles/Citybus_Heavy_Urban.vdri 30485 additions, 0 deletionsDeclaration/MissionCycles/Citybus_Heavy_Urban.vdri
- Declaration/MissionCycles/Citybus_Suburban.vdri 23506 additions, 0 deletionsDeclaration/MissionCycles/Citybus_Suburban.vdri
- Declaration/MissionCycles/Citybus_Urban.vdri 39553 additions, 0 deletionsDeclaration/MissionCycles/Citybus_Urban.vdri
- Declaration/MissionCycles/Coach.vdri 275178 additions, 0 deletionsDeclaration/MissionCycles/Coach.vdri
- Declaration/MissionCycles/Construction.vdri 21221 additions, 0 deletionsDeclaration/MissionCycles/Construction.vdri
- Declaration/MissionCycles/Interurban_Bus.vdri 123592 additions, 0 deletionsDeclaration/MissionCycles/Interurban_Bus.vdri
- Declaration/MissionCycles/Long_Haul.vdri 108193 additions, 0 deletionsDeclaration/MissionCycles/Long_Haul.vdri
- Declaration/MissionCycles/Municipal_Utility.vdri 9964 additions, 0 deletionsDeclaration/MissionCycles/Municipal_Utility.vdri
- Declaration/MissionCycles/Regional_Delivery.vdri 25838 additions, 0 deletionsDeclaration/MissionCycles/Regional_Delivery.vdri
- Declaration/MissionCycles/Urban_Delivery.vdri 27818 additions, 0 deletionsDeclaration/MissionCycles/Urban_Delivery.vdri
- Declaration/PT1.csv 10 additions, 0 deletionsDeclaration/PT1.csv
- Declaration/Reports/4x2r.png 0 additions, 0 deletionsDeclaration/Reports/4x2r.png
- Declaration/Reports/4x2rt.png 0 additions, 0 deletionsDeclaration/Reports/4x2rt.png
- Declaration/Reports/4x2tt.png 0 additions, 0 deletionsDeclaration/Reports/4x2tt.png
- Declaration/Reports/6x2r.png 0 additions, 0 deletionsDeclaration/Reports/6x2r.png
Loading
Please register or sign in to comment