Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
E
ECSS Services
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AcubeSat-OBC
ECSS Services
Commits
7f4c6679
Commit
7f4c6679
authored
6 years ago
by
athatheocsd
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/master' into ECSS_ST-05
parents
46d49e51
4757c15c
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+24
-14
24 additions, 14 deletions
CMakeLists.txt
src/Platform/README.md
+3
-0
3 additions, 0 deletions
src/Platform/README.md
src/Platform/x86/Service.cpp
+0
-0
0 additions, 0 deletions
src/Platform/x86/Service.cpp
with
27 additions
and
14 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
