Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

GSM Bluetooth Drone Bees

  • Loading branch information...
commit 5942a75007d5ce04f55aefba161d7bb45b0cfe7f 1 parent 9405bde
@Jonty Jonty authored
Showing with 5 additions and 3 deletions.
  1. +5 −3 templates/talks.html
View
8 templates/talks.html
@@ -21,6 +21,7 @@
<li><strong>Learn to Solder (Properly)</strong> - Assorted</li>
<li><strong>Learn to Weld</strong> - Chris Paton</li>
<li><strong>A rant about the Space Shuttle</strong> - Russ Garret</li>
+<li><strong>Drones and Quadcopters (Workshop)</strong> - Universal Air</li>
<li><strong>A few short talks</strong> - Tom Scott</li>
<li><strong>Knitting for non-knitters (Workshop)</strong> - Clare Greenhalgh</li>
<li><strong>Feed Toby! What happens when 93,000 people feed your dog over the internet</strong> - Nat Morris</li>
@@ -32,7 +33,7 @@
<li><strong>Hypnosis Workshop</strong> - Dave Ingram</li>
<li><strong>PGP from zero</strong> - Jasper Wallace</li>
<li><strong>Knitting for non-knitters (Talk)</strong> - Clare Greenhalgh</li>
-<li><strong>Radio Design</strong> - Paul Dart</li>
+<li><strong>GSM Basics</strong> - Paul Dart</li>
<li><strong>Blacksmithing Workshop</strong> - Matt Snape (Tentative)</li>
<li><strong>DNSSEC</strong> - Jasper Wallace</li>
<li><strong>The Future is Right Here</strong> - Jez</li>
@@ -42,16 +43,17 @@
<li><strong>Lockpicking (Talk)</strong> - Locksport International</li>
<li><strong>Fabz Video Mapping</strong> - Fabz</li>
<li><strong>TiLDA</strong> - Charles Yarnold</li>
-<li><strong>Bluetooth is Broken</strong> - Mark Steward</li>
+<li><strong>Bluetooth!!!!</strong> - Mark Steward</li>
<li><strong>Beer, and brewing it</strong> - Russ Garrett</li>
<li><strong>Biohacking (Workshop)</strong> - Biohackers</li>
-<li><strong>Drones and Quadcopters</strong> - Universal Air</li>
+<li><strong>Drones and Quadcopters (Talk)</strong> - Universal Air</li>
<li><strong>Hexayurt: Free hardware housing for the world</strong> - Al Razi Masri</li>
<li><strong>Software radio for beginners</strong> - Assorted</li>
<li><strong>Postal Tracking, or, Where do all those Royal Mail vans go?</strong> - Peter Jackson</li>
<li><strong>Internet to a field, the EMF network</strong> - Nat Morris</li>
<li><strong>Mindhacker Hypnoshow</strong> - Dave Ingram</li>
<li><strong>Particle Physics beyond the LHC</strong> - Sam Lindenrathen</li>
+<li><strong>BEEEEEEEEEEEEEEEEES</strong> - Jonty Wareing</li>
<li><strong>Hackerspace Panel Discussion</strong> - Hackerspace People</li>
</ul>
Please sign in to comment.
Something went wrong with that request. Please try again.