Merge pull request #1 from acamilo/master

Rev 4 changes
oshwabadge2018 · Aug 15, 2018 · 8612b64 · 8612b64
2 parents 26e0b37 + 8c1f443
commit 8612b64
Show file tree

Hide file tree

Showing 9 changed files with 6,901 additions and 482 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,10 @@
 
 *.bak
 *.kicad_pcb-bak
+<<<<<<< HEAD
+lib_fp/oshwcert.pretty/oshwa-2.5.svg
+*.zip
+=======
 *.bak
 *.kicad_pcb-bak
+>>>>>>> 26e0b377c7fc111e56a2e50a5e923f17325ca738
diff --git a/fp-lib-table b/fp-lib-table
@@ -14,4 +14,7 @@
   (lib (name oshw)(type KiCad)(uri "$(KIPRJMOD)/lib_fp/oshw.pretty")(options "")(descr ""))
   (lib (name SK6812MINI)(type KiCad)(uri "$(KIPRJMOD)/lib_fp/SK6812MINI .pretty")(options "")(descr ""))
   (lib (name ohs)(type KiCad)(uri ${KIPRJMOD}/lib_fp/ohs.pretty)(options "")(descr ""))
+  (lib (name oshwcert)(type KiCad)(uri ${KIPRJMOD}/lib_fp/oshwcert.pretty)(options "")(descr ""))
+  (lib (name ScreamingCircuts)(type KiCad)(uri ${KIPRJMOD}/lib_fp/ScreamingCircuts.pretty)(options "")(descr ""))
+  (lib (name oshpark)(type KiCad)(uri ${KIPRJMOD}/lib_fp/oshpark.pretty)(options "")(descr ""))
 )