← Back to branch summary

~stegmaier/kicad/3d_initial_merge

~stegmaier/kicad/3d_initial_merge

Viewing all changes in revision 6515.

Committer: Cirilo Bernardo
Date: 2016-02-22 08:58:32 UTC
mfrom: (6351.1.225 kicad)
Revision ID: cirilo@kronos-20160222085832-yvxb5tw47x800i19

Merge with main branch r6576

files removed:
pcbnew/pcad2kicadpcb_plugin/examples/CK1202_V1.pcb

files modified:
eeschema/block.cpp

eeschema/bus-wire-junction.cpp

eeschema/class_libentry.cpp

eeschema/class_netlist_object.cpp

eeschema/class_netlist_object.h

eeschema/class_sch_screen.h

eeschema/dialogs/dialog_annotate_base.cpp

eeschema/dialogs/dialog_annotate_base.h

eeschema/dialogs/dialog_bom_base.cpp

eeschema/dialogs/dialog_bom_base.h

eeschema/dialogs/dialog_choose_component_base.cpp

eeschema/dialogs/dialog_choose_component_base.h

eeschema/dialogs/dialog_edit_component_in_lib_base.cpp

eeschema/dialogs/dialog_edit_component_in_lib_base.h

eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp

eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h

eeschema/dialogs/dialog_edit_label_base.cpp

eeschema/dialogs/dialog_edit_label_base.h

eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp

eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.h

eeschema/dialogs/dialog_eeschema_config_fbp.cpp

eeschema/dialogs/dialog_eeschema_config_fbp.h

eeschema/dialogs/dialog_eeschema_options_base.cpp

eeschema/dialogs/dialog_eeschema_options_base.h

eeschema/dialogs/dialog_erc.cpp

eeschema/dialogs/dialog_erc_base.cpp

eeschema/dialogs/dialog_erc_base.h

eeschema/dialogs/dialog_lib_edit_draw_item.fbp

eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp

eeschema/dialogs/dialog_lib_edit_draw_item_base.h

eeschema/dialogs/dialog_lib_edit_pin.cpp

eeschema/dialogs/dialog_lib_edit_pin.h

eeschema/dialogs/dialog_lib_edit_pin_base.cpp

eeschema/dialogs/dialog_lib_edit_pin_base.fbp

eeschema/dialogs/dialog_lib_edit_pin_base.h

eeschema/dialogs/dialog_lib_edit_pin_table.cpp

eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp

eeschema/dialogs/dialog_lib_edit_pin_table_base.h

eeschema/dialogs/dialog_lib_edit_text_base.cpp

eeschema/dialogs/dialog_lib_edit_text_base.h

eeschema/dialogs/dialog_lib_new_component_base.cpp

eeschema/dialogs/dialog_lib_new_component_base.h

eeschema/dialogs/dialog_libedit_options_base.cpp

eeschema/dialogs/dialog_libedit_options_base.h

eeschema/dialogs/dialog_netlist_base.cpp

eeschema/dialogs/dialog_netlist_base.h

eeschema/dialogs/dialog_plot_schematic_base.cpp

eeschema/dialogs/dialog_plot_schematic_base.h

eeschema/dialogs/dialog_print_using_printer_base.cpp

eeschema/dialogs/dialog_print_using_printer_base.h

eeschema/dialogs/dialog_rescue_each_base.cpp

eeschema/dialogs/dialog_rescue_each_base.h

eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp

eeschema/dialogs/dialog_sch_edit_sheet_pin_base.fbp

eeschema/dialogs/dialog_sch_edit_sheet_pin_base.h

eeschema/dialogs/dialog_sch_sheet_props_base.cpp

eeschema/dialogs/dialog_sch_sheet_props_base.h

eeschema/dialogs/dialog_schematic_find_base.cpp

eeschema/dialogs/dialog_schematic_find_base.h

eeschema/erc.cpp

eeschema/getpart.cpp

eeschema/hierarch.cpp

eeschema/lib_pin.cpp

eeschema/lib_pin.h

eeschema/netlist.cpp

eeschema/pinedit.cpp

eeschema/project_rescue.cpp

eeschema/sch_component.cpp

eeschema/sch_screen.cpp

eeschema/sch_sheet.cpp

eeschema/schedit.cpp

eeschema/schframe.cpp

pcbnew/files.cpp

pcbnew/onleftclick.cpp

pcbnew/pcad2kicadpcb_plugin/examples/files.txt

pcbnew/scripting/plugins/FPC_(SMD_type)_footprintwizard.py

pcbnew/scripting/plugins/HelpfulFootprintWizardPlugin.py

pcbnew/scripting/plugins/bga_wizard.py

pcbnew/scripting/plugins/qfp_wizard.py

pcbnew/scripting/plugins/sdip_wizard.py

pcbnew/scripting/plugins/touch_slider_wizard.py

pcbnew/scripting/plugins/zip_wizard.py

plugins/3d/vrml/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

eeschema/block.cpp

eeschema/bus-wire-junction.cpp

eeschema/class_libentry.cpp

eeschema/class_netlist_object.cpp

eeschema/class_netlist_object.h

eeschema/class_sch_screen.h

eeschema/dialogs/dialog_annotate_base.cpp

eeschema/dialogs/dialog_annotate_base.h

eeschema/dialogs/dialog_bom_base.cpp

eeschema/dialogs/dialog_bom_base.h

eeschema/dialogs/dialog_choose_component_base.cpp

eeschema/dialogs/dialog_choose_component_base.h

eeschema/dialogs/dialog_edit_component_in_lib_base.cpp

eeschema/dialogs/dialog_edit_component_in_lib_base.h

eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp

eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h

eeschema/dialogs/dialog_edit_label_base.cpp

eeschema/dialogs/dialog_edit_label_base.h

eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp

eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.h

eeschema/dialogs/dialog_eeschema_config_fbp.cpp

eeschema/dialogs/dialog_eeschema_config_fbp.h

eeschema/dialogs/dialog_eeschema_options_base.cpp

eeschema/dialogs/dialog_eeschema_options_base.h

eeschema/dialogs/dialog_erc.cpp

eeschema/dialogs/dialog_erc_base.cpp

eeschema/dialogs/dialog_erc_base.h

eeschema/dialogs/dialog_lib_edit_draw_item.fbp

eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp

eeschema/dialogs/dialog_lib_edit_draw_item_base.h

eeschema/dialogs/dialog_lib_edit_pin.cpp

eeschema/dialogs/dialog_lib_edit_pin.h

eeschema/dialogs/dialog_lib_edit_pin_base.cpp

eeschema/dialogs/dialog_lib_edit_pin_base.fbp

eeschema/dialogs/dialog_lib_edit_pin_base.h

eeschema/dialogs/dialog_lib_edit_pin_table.cpp

eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp

eeschema/dialogs/dialog_lib_edit_pin_table_base.h

eeschema/dialogs/dialog_lib_edit_text_base.cpp

eeschema/dialogs/dialog_lib_edit_text_base.h

eeschema/dialogs/dialog_lib_new_component_base.cpp

eeschema/dialogs/dialog_lib_new_component_base.h

eeschema/dialogs/dialog_libedit_options_base.cpp

eeschema/dialogs/dialog_libedit_options_base.h

eeschema/dialogs/dialog_netlist_base.cpp

eeschema/dialogs/dialog_netlist_base.h

eeschema/dialogs/dialog_plot_schematic_base.cpp

eeschema/dialogs/dialog_plot_schematic_base.h

eeschema/dialogs/dialog_print_using_printer_base.cpp

eeschema/dialogs/dialog_print_using_printer_base.h

eeschema/dialogs/dialog_rescue_each_base.cpp

eeschema/dialogs/dialog_rescue_each_base.h

eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp

eeschema/dialogs/dialog_sch_edit_sheet_pin_base.fbp

eeschema/dialogs/dialog_sch_edit_sheet_pin_base.h

eeschema/dialogs/dialog_sch_sheet_props_base.cpp

eeschema/dialogs/dialog_sch_sheet_props_base.h

eeschema/dialogs/dialog_schematic_find_base.cpp

eeschema/dialogs/dialog_schematic_find_base.h

eeschema/erc.cpp

eeschema/getpart.cpp

eeschema/hierarch.cpp

eeschema/lib_pin.cpp

eeschema/lib_pin.h

eeschema/netlist.cpp

eeschema/pinedit.cpp

eeschema/project_rescue.cpp

eeschema/sch_component.cpp

eeschema/sch_screen.cpp

eeschema/sch_sheet.cpp

eeschema/schedit.cpp

eeschema/schframe.cpp

pcbnew/files.cpp

pcbnew/onleftclick.cpp

pcbnew/pcad2kicadpcb_plugin/examples/CK1202_V1.pcb

pcbnew/pcad2kicadpcb_plugin/examples/files.txt

pcbnew/scripting/plugins/FPC_(SMD_type)_footprintwizard.py

pcbnew/scripting/plugins/HelpfulFootprintWizardPlugin.py

pcbnew/scripting/plugins/bga_wizard.py

pcbnew/scripting/plugins/qfp_wizard.py

pcbnew/scripting/plugins/sdip_wizard.py

pcbnew/scripting/plugins/touch_slider_wizard.py

pcbnew/scripting/plugins/zip_wizard.py

plugins/3d/vrml/CMakeLists.txt

Older »