Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

TTool
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

82e128f8

Commit 82e128f8 authored Jun 24, 2019 by Ludovic Apvrille

Downloads
- Plain Diff

Merge branch 'button' into 'master'

Button

See merge request !189

parents a3dd0067 24a0fe86

No related branches found

No related tags found

1 merge request!189Button

Changes 6

Show whitespace changes

Inline Side-by-side

Showing

simulators/c++2/src_simulator/arch/CPU.cpp 3 additions, 1 deletion

simulators/c++2/src_simulator/arch/CPU.cpp
simulators/c++2/src_simulator/arch/FPGA.cpp 15 additions, 5 deletions

simulators/c++2/src_simulator/arch/FPGA.cpp
simulators/c++2/src_simulator/arch/FPGA.h 2 additions, 0 deletions

simulators/c++2/src_simulator/arch/FPGA.h
simulators/c++2/src_simulator/arch/SchedulableDevice.cpp 3 additions, 1 deletion

simulators/c++2/src_simulator/arch/SchedulableDevice.cpp
simulators/c++2/src_simulator/definitions.h 6 additions, 2 deletions

simulators/c++2/src_simulator/definitions.h
simulators/c++2/src_simulator/sim/Simulator.cpp 4 additions, 0 deletions

simulators/c++2/src_simulator/sim/Simulator.cpp

with 33 additions and 9 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment