Differences

This shows you the differences between two versions of the page.

--- start [2016/08/27 18:39] – ilpincy
+++ start [2017/07/13 18:21] – ilpincy
@@ Line 12: / Line 12: @@
 <col sm="6"><panel type="default" title="News">
-  * [2016/06/18] [//talks//] Tutorial at the [[http://www.roboticsconference.org|RSS2016]] [[http://nasaswarmathon.com/rssworkshop|Swarmathon workshop]]
+  * [2017/01/04] [//talks//] The [[http://the.swarming.buzz/ICRA2017/|ICRA2017 tutorial page]] is online!
-  * [2016/03/02] [//other//] Buzz to be used in the [[http://nasaswarmathon.com/|NASA Swarmathon]]
+  * [2016/11/16] [//talks//] Tutorial proposal accepted at [[http://www.icra2017.org/|ICRA2017]].
-  * [2016/01/29] [//talks//] Colloquium at [[http://www.wpi.edu|Worcester Polytechnic Institute]]
+  * [2016/10/29-30] [//demos//] Demo at [[http://northeastrobotics.org/NERC2016.html|NERC 2016]]
+  * [2016/10/12] [//talks//] Oral presentation at [[http://www.iros2016.org/|IROS 2016]]
 [[buzz_news|Older news]]
 </panel></col>
@@ Line 45: / Line 46: @@
 <panel type="default" title="Who Made Buzz?">
-Buzz is a research project conducted at [[http://www.mistlab.ca|MIST]], [[http://www.polymtl.ca|École Polytechnique de Montréal]] and funded by the [[http://www.nserc-crsng.gc.ca|Natural Sciences and Engineering Research Council of Canada]].
+Buzz is a research project conducted at [[http://www.nestlab.org|NESTLab]], [[http://www.wpi.edu|Worcester Polytechnic Institute]], and [[http://www.mistlab.ca|MIST]], [[http://www.polymtl.ca|École Polytechnique de Montréal]]. It is funded by the [[http://www.nserc-crsng.gc.ca|Natural Sciences and Engineering Research Council of Canada]].
 The main developer and maintainer is [[http://carlo.pinciroli.net|Carlo Pinciroli]].
 </panel>