Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki

This commit is contained in:
nvt 2012-03-06 23:23:34 +01:00
commit c4eeb578a7
16 changed files with 208 additions and 168 deletions

View file

@ -48,6 +48,7 @@
#include "lib/random.h"
#include "net/rime.h"
#include "net/rime/timesynch.h"
#include <string.h>
#if TIMESYNCH_CONF_ENABLED
static int authority_level;