Commit 3e14809e authored 8 years ago by Markus Quaritsch

Merge branch 'develop' into feature/Separate-Writer

Conflicts:
	VECTO/VECTO.vbproj

parents 77b36e1a 745e0e11

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Generic Vehicles/Engineering Mode/Class2_RigidTruck_4x2_PTO/Class2_RigidTruck.vveh 4 additions, 4 deletions

...ing Mode/Class2_RigidTruck_4x2_PTO/Class2_RigidTruck.vveh
Generic Vehicles/Engineering Mode/Class2_RigidTruck_4x2_PTO/Class2_RigidTruck_ENG_PTO.vecto 8 additions, 7 deletions

...Class2_RigidTruck_4x2_PTO/Class2_RigidTruck_ENG_PTO.vecto
Generic Vehicles/Engineering Mode/Class2_RigidTruck_4x2_PTO/Class2_RigidTruck_ENG_PTO.vsum 2 additions, 0 deletions

.../Class2_RigidTruck_4x2_PTO/Class2_RigidTruck_ENG_PTO.vsum
Generic Vehicles/Engineering Mode/Class2_RigidTruck_4x2_PTO/Class2_RigidTruck_ENG_PTO_PTO_Collector.vmod 2976 additions, 0 deletions

...ruck_4x2_PTO/Class2_RigidTruck_ENG_PTO_PTO_Collector.vmod
Generic Vehicles/Engineering Mode/Class2_RigidTruck_4x2_PTO/PTO-cycle.vptoc 34 additions, 0 deletions

...ngineering Mode/Class2_RigidTruck_4x2_PTO/PTO-cycle.vptoc
Generic Vehicles/Engineering Mode/Class2_RigidTruck_4x2_PTO/PTO-idle.vptol 15 additions, 5 deletions

...Engineering Mode/Class2_RigidTruck_4x2_PTO/PTO-idle.vptol
Generic Vehicles/Engineering Mode/Class2_RigidTruck_4x2_PTO/PTO_Collector.vdri 805 additions, 25838 deletions

...neering Mode/Class2_RigidTruck_4x2_PTO/PTO_Collector.vdri
Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/324kW.vfld 11 additions, 0 deletions

...les/Engineering Mode/Class4_RigidTruck_4x2_PTO/324kW.vfld
Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/350kW.vmap 107 additions, 0 deletions

...les/Engineering Mode/Class4_RigidTruck_4x2_PTO/350kW.vmap
Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/AMT_12.vgbx 121 additions, 0 deletions

...es/Engineering Mode/Class4_RigidTruck_4x2_PTO/AMT_12.vgbx
Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/Axle_4x2.vtlm 317 additions, 0 deletions

.../Engineering Mode/Class4_RigidTruck_4x2_PTO/Axle_4x2.vtlm
Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/Checks.xlsx 0 additions, 0 deletions

...es/Engineering Mode/Class4_RigidTruck_4x2_PTO/Checks.xlsx
Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/Class4_RigidTruck.vveh 64 additions, 0 deletions

...ing Mode/Class4_RigidTruck_4x2_PTO/Class4_RigidTruck.vveh
Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/Class4_RigidTruck_ENG_PTO.vecto 44 additions, 0 deletions

...Class4_RigidTruck_4x2_PTO/Class4_RigidTruck_ENG_PTO.vecto
Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/Class4_RigidTruck_ENG_PTO.vsum 2 additions, 0 deletions

.../Class4_RigidTruck_4x2_PTO/Class4_RigidTruck_ENG_PTO.vsum
Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/Class4_RigidTruck_ENG_PTO_PTO_Collector.vmod 1336 additions, 0 deletions

...ruck_4x2_PTO/Class4_RigidTruck_ENG_PTO_PTO_Collector.vmod
Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/Engine_324kW_12.7l.veng 20 additions, 0 deletions

...ng Mode/Class4_RigidTruck_4x2_PTO/Engine_324kW_12.7l.veng
Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/Gear_1.vtlm 193 additions, 0 deletions

...es/Engineering Mode/Class4_RigidTruck_4x2_PTO/Gear_1.vtlm
Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/Gear_10.vtlm 193 additions, 0 deletions

...s/Engineering Mode/Class4_RigidTruck_4x2_PTO/Gear_10.vtlm
Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/Gear_11.vtlm 193 additions, 0 deletions

...s/Engineering Mode/Class4_RigidTruck_4x2_PTO/Gear_11.vtlm

with 6445 additions and 25854 deletions

Please register or to comment