From: Keith Packard <keithp@keithp.com>
Date: Sat, 28 Sep 2013 06:09:47 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: telelco-v3.0~849
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=4afe942a6cf957833dfc5311a71883d038b8c824;p=hw%2Faltusmetrum

Merge remote-tracking branch 'origin/master'

Conflicts:
	packages/Makefile
---

4afe942a6cf957833dfc5311a71883d038b8c824
diff --cc packages/Makefile
index 508d64c,746d313..dc60c47
--- a/packages/Makefile
+++ b/packages/Makefile
@@@ -46,7 -49,8 +49,9 @@@ FOOTPRINTS= 
  	saw.fp \
  	tfsoj-8.fp \
  	bc4aa.fp \
+ 	cubesatshield.fp \
 -	linear-s8.fp
++	linear-s8.fp \
 +	PJ-037A.fp
  
  .5c.fp:
  	nickle $*.5c > $@