[Firebug-cvs] firebug/web spie.bib,1.4,1.5 spie_2004.tex,1.3,1.4

[<do...@us...>]

Update of /cvsroot/firebug/firebug/web
In directory sc8-pr-cvs1:/tmp/cvs-serv14337

Modified Files:
	spie.bib spie_2004.tex 
Log Message:
Fixeda conflict in spie.bib

Index: spie.bib
===================================================================
RCS file: /cvsroot/firebug/firebug/web/spie.bib,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** spie.bib	14 Jul 2003 23:17:20 -0000	1.4
--- spie.bib	15 Jul 2003 01:51:07 -0000	1.5
***************
*** 52,56 ****
  }
  
! @inproceedings{Mihai:ProbabilisticLocalization,
    author =       {V.~Ramadurai and M.~L.~Sichitiu},
    title =        {Localization in Wireless Sensor Networks: A
--- 52,57 ----
  }
  
! 
! @inproceedings{ramadurai:v2003,
    author =       {V.~Ramadurai and M.~L.~Sichitiu},
    title =        {Localization in Wireless Sensor Networks: A
***************
*** 59,68 ****
                    Wireless Networks (ICWN 2003)},
    address =      {Las Vegas, NV},
!   month =        Jun,
    year =         2003,
  }
  
  
! @inproceedings{Mihai:SimpleLocalization,
    author =       {M.~L.~Sichitiu and V.~Ramadurai and
                    P.~Peddabachagari},
--- 60,69 ----
                    Wireless Networks (ICWN 2003)},
    address =      {Las Vegas, NV},
!   month =        June,
    year =         2003,
  }
  
  
! @inproceedings{sichitiu:ml2003,
    author =       {M.~L.~Sichitiu and V.~Ramadurai and
                    P.~Peddabachagari},
***************
*** 73,77 ****
                    Wireless Networks (ICWN 2003)},
    address =      {Las Vegas, NV},
!   month =        Jun,
    year =         2003,
  }
--- 74,78 ----
                    Wireless Networks (ICWN 2003)},
    address =      {Las Vegas, NV},
!   month =        June,
    year =         2003,
  }
***************
*** 106,110 ****
    title = 	 {Taming the underlying hurdles for 
  Reliable Multihop Routing in Sensor Networks},
!   booktitle = 	 {},
    OPTcrossref =  {},
    OPTkey = 	 {},
--- 107,111 ----
    title = 	 {Taming the underlying hurdles for 
  Reliable Multihop Routing in Sensor Networks},
!   booktitle = 	 {Proceedings of ACM SenSys 2003},
    OPTcrossref =  {},
    OPTkey = 	 {},
***************
*** 115,120 ****
    OPTnumber = 	 {},
    OPTseries = 	 {},
!   OPTaddress = 	 {},
!   OPTmonth = 	 {},
    OPTorganization = {},
    OPTpublisher = {},
--- 116,121 ----
    OPTnumber = 	 {},
    OPTseries = 	 {},
!   address = 	 {Los Angeles, CA},
!   month = 	 {November 5-7},
    OPTorganization = {},
    OPTpublisher = {},

Index: spie_2004.tex
===================================================================
RCS file: /cvsroot/firebug/firebug/web/spie_2004.tex,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** spie_2004.tex	14 Jul 2003 22:40:22 -0000	1.3
--- spie_2004.tex	15 Jul 2003 01:51:07 -0000	1.4
***************
*** 100,104 ****
  One or two paragraphs describing other work with 
  wireless sensor networks outdoors, specifically,
! ~\cite{mainwaring:a2002,west:b2001,mehta:v2002}.
  
  
--- 100,104 ----
  One or two paragraphs describing other work with 
  wireless sensor networks outdoors, specifically,
! ~\cite{mainwaring:a2002,west:b2001,mehta:v2002,sichitiu:ml2003}.
  
  
***************
*** 126,130 ****
  \item Routing tables evolve using window mean with exponentially weighted,
  moving average (WMEWMA) estimators for evaluating link quality.
! EWMA balances reactivity to changes in link quality (agility) 
  with 
  
--- 126,130 ----
  \item Routing tables evolve using window mean with exponentially weighted,
  moving average (WMEWMA) estimators for evaluating link quality.
! WMEWMA balances reactivity to changes in link quality (agility) 
  with