From: Bdale Garbee <bdale@gag.com>
Date: Sat, 28 Sep 2013 05:52:38 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/hw/altusmetrum
X-Git-Tag: telelco-v3.0~849^2~1
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=cc83ccd0d8ce35b62c0348b512c271de3961a90c;p=hw%2Faltusmetrum

Merge branch 'master' of ssh://git.gag.com/scm/git/hw/altusmetrum

Conflicts:
	packages/Makefile
---

cc83ccd0d8ce35b62c0348b512c271de3961a90c
diff --cc packages/Makefile
index c5b283d,e665e4d..746d313
--- a/packages/Makefile
+++ b/packages/Makefile
@@@ -42,9 -42,10 +42,15 @@@ FOOTPRINTS= 
  	ADXL78.fp \
  	MOT1317.fp \
  	mlp8-4x3.fp \
 +	saw.fp \
 +	cubesatshield.fp \
 +	linear-s8.fp
+ 	ufqfpn48.fp \
+ 	saw.fp \
+ 	tfsoj-8.fp \
 -	bc4aa.fp
++	bc4aa.fp \
++	cubesatshield.fp \
++	linear-s8.fp
  
  .5c.fp:
  	nickle $*.5c > $@