From: Karine Deschinkel <kdeschin@grappa.iut-bm.univ-fcomte.fr>
Date: Mon, 2 Nov 2015 11:08:28 +0000 (+0100)
Subject: Merge branch 'master' of ssh://bilbo.iut-bm.univ-fcomte.fr/Sensornets15
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/Sensornets15.git/commitdiff_plain/9465a19d403578b9a707d8eb3caf67fb44899dd2?hp=-c

Merge branch 'master' of ssh://bilbo.iut-bm.univ-fcomte.fr/Sensornets15
---

9465a19d403578b9a707d8eb3caf67fb44899dd2
diff --combined Example.aux
index 687f22b,19e4b8d..3df82d8
--- a/Example.aux
+++ b/Example.aux
@@@ -88,7 -88,7 +88,7 @@@
  \@writefile{lof}{\contentsline {figure}{\numberline {5}{\ignorespaces Network lifetime\relax }}{10}}
  \newlabel{figLT95}{{5}{10}}
  \bibstyle{plain}
- \bibdata{Example}
+ \bibdata{biblio}
  \bibcite{ref17}{1}
  \bibcite{ref19}{2}
  \bibcite{berman04}{3}
@@@ -98,30 -98,32 +98,30 @@@
  \bibcite{conti2014mobile}{7}
  \bibcite{Deng2012}{8}
  \bibcite{deschinkel2012column}{9}
 -\bibcite{DBLP:conf/hicss/HeinzelmanCB00}{10}
 +\bibcite{idrees2014coverage}{10}
  \@writefile{toc}{\contentsline {section}{\numberline {6}\uppercase {Conclusion and future work}}{11}}
  \newlabel{sec:Conclusion and Future Works}{{6}{11}}
 -\bibcite{idrees2014coverage}{11}
 -\bibcite{jaggi2006}{12}
 -\bibcite{kim2013maximum}{13}
 -\bibcite{Kumar:2005}{14}
 -\bibcite{li2013survey}{15}
 -\bibcite{ling2009energy}{16}
 -\bibcite{pujari2011high}{17}
 -\bibcite{Misra}{18}
 -\bibcite{Nayak04}{19}
 -\bibcite{pc10}{20}
 -\bibcite{pedraza2006}{21}
 -\bibcite{qu2013distributed}{22}
 -\bibcite{raghunathan2002energy}{23}
 -\bibcite{ijcses11}{24}
 -\bibcite{ref22}{25}
 -\bibcite{rossi2012exact}{26}
 -\bibcite{varga}{27}
 -\bibcite{chin2007}{28}
 -\bibcite{ChinhVu}{29}
 -\bibcite{5714480}{30}
 -\bibcite{xu2001geography}{31}
 -\bibcite{yang2014novel}{32}
 -\bibcite{yangnovel}{33}
 -\bibcite{Yang2014}{34}
 -\bibcite{Zhang05}{35}
 -\bibcite{zorbas2010solving}{36}
 +\bibcite{jaggi2006}{11}
 +\bibcite{kim2013maximum}{12}
 +\bibcite{Kumar:2005}{13}
 +\bibcite{li2013survey}{14}
 +\bibcite{ling2009energy}{15}
 +\bibcite{pujari2011high}{16}
 +\bibcite{Misra}{17}
 +\bibcite{Nayak04}{18}
 +\bibcite{pc10}{19}
 +\bibcite{pedraza2006}{20}
 +\bibcite{qu2013distributed}{21}
 +\bibcite{raghunathan2002energy}{22}
 +\bibcite{ref22}{23}
 +\bibcite{rossi2012exact}{24}
 +\bibcite{varga}{25}
 +\bibcite{chin2007}{26}
 +\bibcite{ChinhVu}{27}
 +\bibcite{5714480}{28}
 +\bibcite{xu2001geography}{29}
 +\bibcite{yang2014novel}{30}
 +\bibcite{yangnovel}{31}
 +\bibcite{Yang2014}{32}
 +\bibcite{Zhang05}{33}
 +\bibcite{zorbas2010solving}{34}