Merge branch 'develop' into 'master'

Develop



See merge request !27
This commit is contained in:
tkl 2016-08-21 10:39:40 +00:00
commit e22c0629b2
2 changed files with 2 additions and 2 deletions

View File

@ -1,7 +1,7 @@
variables:
SW_KERNEL: "0"
SW_MAJOR: "1"
SW_MINOR: "3"
SW_MINOR: "4"
before_script:
- "echo $CI_BUILD_ID"

View File

@ -8,7 +8,6 @@
#include <stdbool.h>
#include <stddef.h>
#include "board.h"
#include "queue.h"
#include "stack.h"
#include "kernel.h"
@ -17,6 +16,7 @@ static struct thread_context main_task;
static stack_t main_stack[0xFF];
extern void main(void *arg);
extern void board_init(void);
int start_application (int argc, char* argv[])
{