[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/eyesIFX ActiveMessageC.nc, 1.1.2.6.2.1, 1.1.2.6.2.2 RadioDataLinkC.nc, 1.1.2.6.2.1, 1.1.2.6.2.2

[Philipp Huppertz]

Update of /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13757/tos/platforms/eyesIFX

Modified Files:
      Tag: tos-2-msp430-usart-configure-candidate
	ActiveMessageC.nc RadioDataLinkC.nc 
Log Message:
- fix unnecessary conflicts

Index: ActiveMessageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/ActiveMessageC.nc,v
retrieving revision 1.1.2.6.2.1
retrieving revision 1.1.2.6.2.2
diff -C2 -d -r1.1.2.6.2.1 -r1.1.2.6.2.2
*** ActiveMessageC.nc	5 Oct 2006 08:25:44 -0000	1.1.2.6.2.1
--- ActiveMessageC.nc	5 Oct 2006 09:18:07 -0000	1.1.2.6.2.2
***************
*** 29,38 ****
   * 94704.  Attention:  Intel License Inquiry.
   */
- /*
-  *
-  * Authors:             Philip Levis
-  * Date last modified:  $Id$
-  *
-  */
  
  /**
--- 29,32 ----