Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

SWIFTsim
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents

Snippets Groups Projects

26ddd08a

Commit 26ddd08a authored 9 years ago by Pedro Gonnet

Downloads
- Plain Diff

Merge branch 'master' of gitlab.cosma.dur.ac.uk:swift/swiftsim into local_variable_cleanup

Conflicts:
	src/engine.c

parents 909e7f8d 2c31f0e5

No related branches found

No related tags found

2 merge requests!136Master,!113Local variable cleanup

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

configure.ac 5 additions, 0 deletions

configure.ac
src/Makefile.am 1 addition, 1 deletion

src/Makefile.am
src/engine.c 27 additions, 26 deletions

src/engine.c
src/engine.h 14 additions, 0 deletions

src/engine.h
src/part.c 68 additions, 0 deletions

src/part.c
src/part.h 19 additions, 2 deletions

src/part.h
src/queue.c 64 additions, 36 deletions

src/queue.c
src/queue.h 2 additions, 1 deletion

src/queue.h
src/runner.c 5 additions, 12 deletions

src/runner.c
src/scheduler.c 16 additions, 8 deletions

src/scheduler.c
src/scheduler.h 15 additions, 1 deletion

src/scheduler.h
src/task.c 52 additions, 4 deletions

src/task.c
src/task.h 1 addition, 0 deletions

src/task.h
src/version.c 132 additions, 8 deletions

src/version.c
src/version.h.in 3 additions, 0 deletions

src/version.h.in

with 424 additions and 99 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