[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/mica2/Timer BlinkC.nc, 1.2.2.2, 1.2.2.3 BlinkM.nc, 1.2.2.2, 1.2.2.3

[Kevin Klues]

Update of /cvsroot/tinyos/tinyos-2.x/apps/tests/mica2/Timer
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31559/apps/tests/mica2/Timer

Modified Files:
      Tag: tos-2-resource-pm-eval-cand
	BlinkC.nc BlinkM.nc 
Log Message:
Check in changes to files containing conflict.  I'm not sure where these come from, as they are always in the revision and date fileds set by CVs, but nevertheless......