mirror of
https://github.com/oliverschmidt/contiki.git
synced 2025-02-04 07:30:59 +00:00
Merge branch 'master' of github.com:adamdunkels/contiki-2.x
This commit is contained in:
commit
705a0859da
@ -31,6 +31,7 @@
|
|||||||
* @(#)$$
|
* @(#)$$
|
||||||
*/
|
*/
|
||||||
/* Test github commit from windows 7 TortoiseGit */
|
/* Test github commit from windows 7 TortoiseGit */
|
||||||
|
/* Test github commit from Vista TortoiseGit */
|
||||||
/**
|
/**
|
||||||
* \file
|
* \file
|
||||||
* Configuration for Atmel Raven
|
* Configuration for Atmel Raven
|
||||||
@ -39,7 +40,7 @@
|
|||||||
* Simon Barner <barner@in.tum.de>
|
* Simon Barner <barner@in.tum.de>
|
||||||
* David Kopf <dak664@embarqmail.com>
|
* David Kopf <dak664@embarqmail.com>
|
||||||
*/
|
*/
|
||||||
|
/* Test git commit */
|
||||||
#ifndef __CONTIKI_CONF_H__
|
#ifndef __CONTIKI_CONF_H__
|
||||||
#define __CONTIKI_CONF_H__
|
#define __CONTIKI_CONF_H__
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user