From: Keith Packard <keithp@keithp.com>
Date: Fri, 3 May 2013 06:17:17 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/master' into stm-flash
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=d6900a5d1fc24f007fc479eb528b199dd195e1eb;p=fw%2Faltos

Merge remote-tracking branch 'origin/master' into stm-flash

Conflicts:
	altosdroid/Notebook
---

d6900a5d1fc24f007fc479eb528b199dd195e1eb
diff --cc altosdroid/Notebook
index 6c5cfacf,b2ae407c..22f0394b
--- a/altosdroid/Notebook
+++ b/altosdroid/Notebook
@@@ -21,5 -21,6 +21,8 @@@ Desired AltosDroid feature lis
  
   *) Select satellite imaging mode
  
 + *) Re-loading flight data from .telem file to get back to
 +    'find my rocket' mode after shutting down the application.
++
+  *) Remember most-recently-used TBT and frequency, perhaps
+     auto-connect at startup.
 -