Merge branch 'master' of https://github.com/KiCad/kicad-library into …

…add_FRT5_relay # Conflicts: # library/relays.dcm # library/relays.lib
sudomgamal · Feb 21, 2017 · 86024ea · 86024ea
2 parents fe49813 + 438ccf0
commit 86024ea
Show file tree

Hide file tree

Showing 3,734 changed files with 4,712,495 additions and 722,879 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,9 @@
+*   text=lf
+*.wrl   -diff
+*.pack  binary
+*.png   binary
+*.step  binary
+*.wings binary
+*.svg   binary
+*.pdf   binary
+*.pyc   binary
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,14 +5,11 @@ cmake_minimum_required( VERSION 2.6.1 FATAL_ERROR )
 # Locations for install targets.
 if( APPLE )
     # Like all variables, CMAKE_INSTALL_PREFIX can be over-ridden on the command line.
-    set( CMAKE_INSTALL_PREFIX /
-        CACHE PATH "" )
+    set( CMAKE_INSTALL_PREFIX "/Library/Application Support/kicad/" CACHE PATH "" )
     # Everything without leading / is relative to CMAKE_INSTALL_PREFIX.
-    set( KICAD_DATA "Library/Application Support/kicad/"
-        CACHE PATH "Location of KiCad data files." )
-    set( KICAD_MODULES ${KICAD_DATA}/modules )
-    set( KICAD_LIBRARY ${KICAD_DATA}/library )
-    set( KICAD_TEMPLATE ${KICAD_DATA}/template )
+    set( KICAD_MODULES modules )
+    set( KICAD_LIBRARY library )
+    set( KICAD_TEMPLATE template )
 else()
     # Everything without leading / is relative to CMAKE_INSTALL_PREFIX.
     set( KICAD_DATA share/kicad

diff --git a/README.md b/README.md
@@ -1,15 +1,19 @@
-kicad-library
+KiCad Library
 =============
 
-The schematic and 3D libraries supported by KiCad team.
+This repository contains the official schematic and 3D libraries supported by the KiCad library team.
 
 The footprint libraries are the `*.pretty` repos themselves and are used online by default. If you want to download them locally, the `library-repos-install.bat` and `library-repos-install.sh` scripts [in the KiCad source](http://bazaar.launchpad.net/~kicad-product-committers/kicad/product/files/head:/scripts/) can do this automatically.
 
 
-For more information, please check: http://kicad-pcb.org/contribute/librarians/
-
-
 How to Contribute
 =================
 
-Please, check the [CONTRIBUTING.md](CONTRIBUTING.md) file.
+Please, check the [CONTRIBUTING.md](CONTRIBUTING.md) file, or refer to the [Wiki Page](https://github.com/KiCad/kicad-library/wiki/How-To-Contribute).
+
+Further Information
+===================
+
+* [KiCad Website](http://kicad-pcb.org/contribute/librarians/)
+* [KiCad Library Convention](https://github.com/KiCad/kicad-library/wiki/Kicad-Library-Convention) (KLC)
+* [KiCad Library Wiki](https://github.com/KiCad/kicad-library/wiki)
diff --git a/doc/klc_images/klc_10.greenshot b/doc/klc_images/klc_10.greenshot
diff --git a/doc/klc_images/klc_10.png b/doc/klc_images/klc_10.png
diff --git a/doc/klc_images/klc_10_smd.greenshot b/doc/klc_images/klc_10_smd.greenshot
diff --git a/doc/klc_images/klc_10_smd.png b/doc/klc_images/klc_10_smd.png
diff --git a/doc/klc_images/klc_3.greenshot b/doc/klc_images/klc_3.greenshot
diff --git a/doc/klc_images/klc_3.png b/doc/klc_images/klc_3.png
diff --git a/doc/klc_images/klc_3_v2.greenshot b/doc/klc_images/klc_3_v2.greenshot
diff --git a/doc/klc_images/klc_3_v2.png b/doc/klc_images/klc_3_v2.png
diff --git a/doc/klc_images/klc_7_3_4.greenshot b/doc/klc_images/klc_7_3_4.greenshot
diff --git a/doc/klc_images/klc_7_3_4.png b/doc/klc_images/klc_7_3_4.png
diff --git a/doc/klc_images/klc_7_3_4_smd.greenshot b/doc/klc_images/klc_7_3_4_smd.greenshot
diff --git a/doc/klc_images/klc_7_3_4_smd.png b/doc/klc_images/klc_7_3_4_smd.png
diff --git a/doc/klc_images/klc_7_5_6.greenshot b/doc/klc_images/klc_7_5_6.greenshot
diff --git a/doc/klc_images/klc_7_5_6.png b/doc/klc_images/klc_7_5_6.png
diff --git a/doc/klc_images/klc_8_2.greenshot b/doc/klc_images/klc_8_2.greenshot
diff --git a/doc/klc_images/klc_8_2.png b/doc/klc_images/klc_8_2.png
diff --git a/doc/klc_images/klc_9_2+3.greenshot b/doc/klc_images/klc_9_2+3.greenshot
diff --git a/doc/klc_images/klc_9_2+3.png b/doc/klc_images/klc_9_2+3.png
diff --git a/doc/klc_images/readme.txt b/doc/klc_images/readme.txt
@@ -0,0 +1,6 @@
+this folder contains images that illustrate different KLC rules for the KLC wiki page:
+  https://github.com/KiCad/kicad-library/wiki/Kicad-Library-Convention
+
+
+Greenshot (http://getgreenshot.org/) was used to create the screenshots and 
+annotations. It can also be used to edit them.