From 7b8cb3187067d933381c5bb85a7d35b8e43ae41e Mon Sep 17 00:00:00 2001
From: Xiangfu <xiangfu@openmobilefree.net>
Date: Mon, 16 Apr 2012 17:57:07 +0800
Subject: [PATCH] merge fsmra2jh.lib and switch.lib

---
 components/fsmra2jh.lib                 | 32 -------------------------
 components/{fsmra2jh.dcm => switch.dcm} |  0
 components/switch.lib                   | 19 +++++++++++++--
 3 files changed, 17 insertions(+), 34 deletions(-)
 delete mode 100644 components/fsmra2jh.lib
 rename components/{fsmra2jh.dcm => switch.dcm} (100%)

diff --git a/components/fsmra2jh.lib b/components/fsmra2jh.lib
deleted file mode 100644
index 15253d1..0000000
--- a/components/fsmra2jh.lib
+++ /dev/null
@@ -1,32 +0,0 @@
-EESchema-LIBRARY Version 2.3  Date: Wed 04 Apr 2012 09:09:37 CST
-#
-# FSMRA2JH
-#
-DEF FSMRA2JH SW 0 40 N N 1 F N
-F0 "SW" -184 300 50 H V C CNN
-F1 "FSMRA2JH" -70 232 50 H V C CNN
-DRAW
-S -250 200 250 -100 0 1 0 N
-S -170 50 170 60 0 1 0 N
-P 4 0 1 0  -40 60  -30 90  30 90  40 60 N
-X 1 1 -300 0 200 R 60 60 0 1 P I
-X 2 2 300 0 200 L 60 60 0 1 P I
-X SHIELD 3 -100 -200 100 U 50 50 1 1 P
-X SHIELD 4 100 -200 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# SW_PUSH
-#
-DEF SW_PUSH SW 0 40 N N 1 F N
-F0 "SW" 150 110 50 H V C CNN
-F1 "SW_PUSH" 0 -80 50 H V C CNN
-DRAW
-S -170 50 170 60 0 1 0 N
-P 4 0 1 0  -40 60  -30 90  30 90  40 60 N
-X 1 1 -300 0 200 R 60 60 0 1 P I
-X 2 2 300 0 200 L 60 60 0 1 P I
-ENDDRAW
-ENDDEF
-#
-#End Library
diff --git a/components/fsmra2jh.dcm b/components/switch.dcm
similarity index 100%
rename from components/fsmra2jh.dcm
rename to components/switch.dcm
diff --git a/components/switch.lib b/components/switch.lib
index 99f0bf5..15253d1 100644
--- a/components/switch.lib
+++ b/components/switch.lib
@@ -1,5 +1,20 @@
-EESchema-LIBRARY Version 2.3  Date: Mon 16 Apr 2012 05:27:59 PM CST
-#encoding utf-8
+EESchema-LIBRARY Version 2.3  Date: Wed 04 Apr 2012 09:09:37 CST
+#
+# FSMRA2JH
+#
+DEF FSMRA2JH SW 0 40 N N 1 F N
+F0 "SW" -184 300 50 H V C CNN
+F1 "FSMRA2JH" -70 232 50 H V C CNN
+DRAW
+S -250 200 250 -100 0 1 0 N
+S -170 50 170 60 0 1 0 N
+P 4 0 1 0  -40 60  -30 90  30 90  40 60 N
+X 1 1 -300 0 200 R 60 60 0 1 P I
+X 2 2 300 0 200 L 60 60 0 1 P I
+X SHIELD 3 -100 -200 100 U 50 50 1 1 P
+X SHIELD 4 100 -200 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
 #
 # SW_PUSH
 #