deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:adamdunkels/contiki-2.x

Browse source
This commit is contained in:
Nicolas Tsiftes 2011-02-07 17:29:47 +01:00
parent aeca16d01f ceea35f7a8
commit 705a0859da
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
platform/avr-raven/contiki-conf.h
View file

@ -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__