3 files changed, 35 insertions, 29 deletions

diff --git a/cad/kicad-devel/Makefile.git_rev b/cad/kicad-devel/Makefile.git_rev
index 59dbced371b7..e296851ce628 100644
--- a/cad/kicad-devel/Makefile.git_rev
+++ b/cad/kicad-devel/Makefile.git_rev
@@ -1,2 +1,2 @@
-GIT_SRC_HASH=  d776eaca83b995bfe9fd75451e24ff7fc19384f8
-GIT_SRC_DATE=  20180420191845
+GIT_SRC_HASH=  101b68b610d4334db68f1e4ba9e287b37f65c9a6
+GIT_SRC_DATE=  20180703172316
diff --git a/cad/kicad-devel/distinfo b/cad/kicad-devel/distinfo
index 53c47082d429..5bee29cb7ce7 100644
--- a/cad/kicad-devel/distinfo
+++ b/cad/kicad-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524405061
-SHA256 (kicad/KiCad-kicad-source-mirror-r20180420191845-d776eaca83b995bfe9fd75451e24ff7fc19384f8_GH0.tar.gz) = dcfc620d953f524afa0db49aa27ea8723112ec548a23ccf17bb2fca0b350f9db
-SIZE (kicad/KiCad-kicad-source-mirror-r20180420191845-d776eaca83b995bfe9fd75451e24ff7fc19384f8_GH0.tar.gz) = 24202265
+TIMESTAMP = 1530796083
+SHA256 (kicad/KiCad-kicad-source-mirror-r20180703172316-101b68b610d4334db68f1e4ba9e287b37f65c9a6_GH0.tar.gz) = 81910bdd36b7ae517505060be1bc0091b54c30c7337df26a42535ef3ecb0ceae
+SIZE (kicad/KiCad-kicad-source-mirror-r20180703172316-101b68b610d4334db68f1e4ba9e287b37f65c9a6_GH0.tar.gz) = 24116062
diff --git a/cad/kicad-devel/pkg-plist b/cad/kicad-devel/pkg-plist
index 2b34b30d49b5..c2cefde4e331 100644
--- a/cad/kicad-devel/pkg-plist
+++ b/cad/kicad-devel/pkg-plist
@@ -18,21 +18,6 @@ bin/pcbnew
 bin/pl_editor
 lib/kicad/plugins/3d/libs3d_plugin_idf.so
 lib/kicad/plugins/3d/libs3d_plugin_vrml.so
-lib/kicad/plugins/README-bom.txt
-lib/kicad/plugins/bom2csv.xsl
-lib/kicad/plugins/bom2grouped_csv.xsl
-lib/kicad/plugins/bom_csv_grouped_by_value.py
-lib/kicad/plugins/bom_csv_grouped_by_value_with_fp.py
-lib/kicad/plugins/bom_csv_sorted_by_ref.py
-lib/kicad/plugins/bom_html_grouped_by_value.py
-lib/kicad/plugins/bom_html_with_advanced_grouping.py
-lib/kicad/plugins/bom_sorted_by_ref.py
-lib/kicad/plugins/bom_with_title_block_2_csv.xsl
-lib/kicad/plugins/kicad_netlist_reader.py
-lib/kicad/plugins/netlist_form_OrcadPcb2.xsl
-lib/kicad/plugins/netlist_form_cadstar-RINF.xsl
-lib/kicad/plugins/netlist_form_cadstar.xsl
-lib/kicad/plugins/netlist_form_pads-pcb.asc.xsl
 lib/libkicad_3dsg.so
 lib/libkicad_3dsg.so.2.0.0
 %%PYTHON_SITELIBDIR%%/_pcbnew.so
@@ -186,17 +171,20 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/demos/interf_u/tux.bmp
 %%DATADIR%%/demos/interf_u/tux.kicad_mod
 %%DATADIR%%/demos/interf_u/tux.lib
+%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/fp-lib-table
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/in_out_conn.sch
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213-cache.lib
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.kicad_pcb
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.net
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.pro
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.sch
+%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213_schlib.dcm
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213_schlib.lib
+%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/Device.switch_toggle_horizontal_right_angle_PC_terminal.wings
+%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/Device.switch_toggle_horizontal_right_angle_PC_terminal.wrl
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/Jack.wings
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/Jack.wrl
-%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/dpack_5.wings
-%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/dpack_5.wrl
+%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/db9_female_pin90deg.wrl
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/push_butt_4pads.wings
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/push_butt_4pads.wrl
 %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/sym-lib-table
@@ -205,7 +193,10 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/demos/microwave/microwave.pro
 %%DATADIR%%/demos/microwave/shape1.txt
 %%DATADIR%%/demos/pic_programmer/fp-lib-table
-%%DATADIR%%/demos/pic_programmer/libs/pic_programmer_fp.pretty/1pin-4.kicad_mod
+%%DATADIR%%/demos/pic_programmer/libs/pic_programmer_fp.pretty/40tex-Ell600.kicad_mod
+%%DATADIR%%/demos/pic_programmer/libs/pic_programmer_fp.pretty/RV2X4.kicad_mod
+%%DATADIR%%/demos/pic_programmer/libs/pic_programmer_fp.pretty/TO-92_BC237_307.kicad_mod
+%%DATADIR%%/demos/pic_programmer/libs/pic_programmer_schlib.dcm
 %%DATADIR%%/demos/pic_programmer/libs/pic_programmer_schlib.lib
 %%DATADIR%%/demos/pic_programmer/pic_programmer-cache.lib
 %%DATADIR%%/demos/pic_programmer/pic_programmer.kicad_pcb
@@ -214,12 +205,6 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/demos/pic_programmer/pic_programmer.sch
 %%DATADIR%%/demos/pic_programmer/pic_sockets.sch
 %%DATADIR%%/demos/pic_programmer/sym-lib-table
-%%DATADIR%%/demos/pspice/pspice-cache.lib
-%%DATADIR%%/demos/pspice/pspice.pro
-%%DATADIR%%/demos/pspice/pspice.sch
-%%DATADIR%%/demos/pspice/schematic_libspice.dcm
-%%DATADIR%%/demos/pspice/schematic_libspice.lib
-%%DATADIR%%/demos/pspice/sym-lib-table
 %%DATADIR%%/demos/python_scripts_examples/action_menu_add_automatic_border.py
 %%DATADIR%%/demos/python_scripts_examples/action_menu_text_by_date.py
 %%DATADIR%%/demos/python_scripts_examples/action_plugin_test_undoredo.py
@@ -233,6 +218,12 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/demos/simulation/laser_driver/laser_driver.sch
 %%DATADIR%%/demos/simulation/laser_driver/laser_driver_schlib.lib
 %%DATADIR%%/demos/simulation/laser_driver/sym-lib-table
+%%DATADIR%%/demos/simulation/pspice/pspice-cache.lib
+%%DATADIR%%/demos/simulation/pspice/pspice.pro
+%%DATADIR%%/demos/simulation/pspice/pspice.sch
+%%DATADIR%%/demos/simulation/pspice/schematic_libspice.dcm
+%%DATADIR%%/demos/simulation/pspice/schematic_libspice.lib
+%%DATADIR%%/demos/simulation/pspice/sym-lib-table
 %%DATADIR%%/demos/simulation/rectifier/rectifier-cache.lib
 %%DATADIR%%/demos/simulation/rectifier/rectifier.pro
 %%DATADIR%%/demos/simulation/rectifier/rectifier.sch
@@ -288,6 +279,21 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/demos/video/video.net
 %%DATADIR%%/demos/video/video.pro
 %%DATADIR%%/demos/video/video.sch
+%%DATADIR%%/plugins/README-bom.txt
+%%DATADIR%%/plugins/bom2csv.xsl
+%%DATADIR%%/plugins/bom2grouped_csv.xsl
+%%DATADIR%%/plugins/bom_csv_grouped_by_value.py
+%%DATADIR%%/plugins/bom_csv_grouped_by_value_with_fp.py
+%%DATADIR%%/plugins/bom_csv_sorted_by_ref.py
+%%DATADIR%%/plugins/bom_html_grouped_by_value.py
+%%DATADIR%%/plugins/bom_html_with_advanced_grouping.py
+%%DATADIR%%/plugins/bom_sorted_by_ref.py
+%%DATADIR%%/plugins/bom_with_title_block_2_csv.xsl
+%%DATADIR%%/plugins/kicad_netlist_reader.py
+%%DATADIR%%/plugins/netlist_form_OrcadPcb2.xsl
+%%DATADIR%%/plugins/netlist_form_cadstar-RINF.xsl
+%%DATADIR%%/plugins/netlist_form_cadstar.xsl
+%%DATADIR%%/plugins/netlist_form_pads-pcb.asc.xsl
 %%DATADIR%%/scripting/kicad_pyshell/__init__.py
 %%DATADIR%%/scripting/plugins/FPC_wizard.py
 %%DATADIR%%/scripting/plugins/FootprintWizardBase.py