[Tinyos-beta-commits] CVS: tinyos-1.x/beta/SystemCore/java/net/tinyos Makefile, 1.10, 1.10.4.1

[Kristin Wright]

Update of /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8305/beta/SystemCore/java/net/tinyos

Modified Files:
      Tag: tos-1-1-8-candidate
	Makefile 
Log Message:
merge with trunk using the tos-1-1-8-postbugfix trunk snapshot

Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/Makefile,v
retrieving revision 1.10
retrieving revision 1.10.4.1
diff -C2 -d -r1.10 -r1.10.4.1
*** Makefile	23 Aug 2004 23:19:50 -0000	1.10
--- Makefile	11 Nov 2004 13:43:27 -0000	1.10.4.1
***************
*** 1,3 ****
! SUBDIRS = hello drip multihop mgmtquery eventlogger powermgmt deluge grouper
  
  ROOT = $(TOSDIR)/../tools/java
--- 1,3 ----
! SUBDIRS = drip multihop hello mgmtquery eventlogger powermgmt deluge grouper
  
  ROOT = $(TOSDIR)/../tools/java