← Back to branch summary

~dickelbeck/kicad/merge-1

~dickelbeck/kicad/merge-1

Viewing all changes in revision 2404.

Committer: Dick Hollenbeck
Date: 2010-06-30 12:53:16 UTC
mfrom: (2403.1.5 testing)
Revision ID: dick@softplc.com-20100630125316-u57plecrft74kadf

mainline-merges

files added:
bitmap2component/bitmap2component.ico

bitmap2component/bitmap2component.rc

bitmap2component/bitmap2component.xpm

demos/interf_u/image.emp

demos/interf_u/image.lib

demos/interf_u/tux.bmp

eeschema/help_common_strings.h

pcbnew/help_common_strings.h

files removed:
bitmap2component/gui_bm2cmp.cpp

files modified:
CHANGELOG.txt

INSTALL.txt

bitmap2component/CMakeLists.txt

bitmap2component/bitmap2cmp_gui.cpp

bitmap2component/bitmap2cmp_gui_base.cpp

bitmap2component/bitmap2cmp_gui_base.fbp

bitmap2component/bitmap2component.cpp

demos/interf_u/interf_u.brd

demos/interf_u/interf_u.pro

demos/interf_u/interf_u.sch

demos/pic_programmer/pic_programmer.pro

eeschema/annotate.cpp

eeschema/block.cpp

eeschema/build_BOM.cpp

eeschema/class_drawsheet.cpp

eeschema/class_drawsheet.h

eeschema/class_hierarchical_PIN_sheet.cpp

eeschema/class_libentry.cpp

eeschema/class_libentry.h

eeschema/class_netlist_object.cpp

eeschema/class_netlist_object.h

eeschema/class_pin.cpp

eeschema/class_sch_component.cpp

eeschema/dangling_ends.cpp

eeschema/delete.cpp

eeschema/dialog_create_component.cpp

eeschema/dialog_edit_component_in_lib.cpp

eeschema/dialog_edit_component_in_schematic.cpp

eeschema/edit_component_in_lib.cpp

eeschema/erc.cpp

eeschema/files-io.cpp

eeschema/libedit.cpp

eeschema/load_one_schematic_file.cpp

eeschema/locate.cpp

eeschema/menubar.cpp

eeschema/menubar_libedit.cpp

eeschema/netform.cpp

eeschema/netlist.cpp

eeschema/netlist.h

eeschema/netlist_control.cpp

eeschema/onrightclick.cpp

eeschema/plot.cpp

eeschema/read_from_file_schematic_items_descriptions.cpp

eeschema/schedit.cpp

eeschema/sheet.cpp

eeschema/sheetlab.cpp

eeschema/symbedit.cpp

eeschema/tool_lib.cpp

eeschema/tool_sch.cpp

gerbview/files.cpp

pcbnew/automove.cpp

pcbnew/class_edge_mod.cpp

pcbnew/dialog_gendrill_base.cpp

pcbnew/dialog_gendrill_base.fbp

pcbnew/menubar_pcbframe.cpp

pcbnew/tool_pcb.cpp

pcbnew/zones_convert_brd_items_to_polygons.cpp

Show diffs side-by-side

added added

removed removed

bitmap2component/CMakeLists.txt

bitmap2component/bitmap2cmp_gui.cpp

bitmap2component/bitmap2cmp_gui_base.cpp

bitmap2component/bitmap2cmp_gui_base.fbp

bitmap2component/bitmap2component.cpp

bitmap2component/bitmap2component.ico

bitmap2component/bitmap2component.rc

bitmap2component/bitmap2component.xpm

bitmap2component/gui_bm2cmp.cpp

demos/interf_u/image.emp

demos/interf_u/image.lib

demos/interf_u/interf_u.brd

demos/interf_u/interf_u.pro

demos/interf_u/interf_u.sch

demos/interf_u/tux.bmp

demos/pic_programmer/pic_programmer.pro

eeschema/annotate.cpp

eeschema/block.cpp

eeschema/build_BOM.cpp

eeschema/class_drawsheet.cpp

eeschema/class_drawsheet.h

eeschema/class_hierarchical_PIN_sheet.cpp

eeschema/class_libentry.cpp

eeschema/class_libentry.h

eeschema/class_netlist_object.cpp

eeschema/class_netlist_object.h

eeschema/class_pin.cpp

eeschema/class_sch_component.cpp

eeschema/dangling_ends.cpp

eeschema/delete.cpp

eeschema/dialog_create_component.cpp

eeschema/dialog_edit_component_in_lib.cpp

eeschema/dialog_edit_component_in_schematic.cpp

eeschema/edit_component_in_lib.cpp

eeschema/erc.cpp

eeschema/files-io.cpp

eeschema/help_common_strings.h

eeschema/libedit.cpp

eeschema/load_one_schematic_file.cpp

eeschema/locate.cpp

eeschema/menubar.cpp

eeschema/menubar_libedit.cpp

eeschema/netform.cpp

eeschema/netlist.cpp

eeschema/netlist.h

eeschema/netlist_control.cpp

eeschema/onrightclick.cpp

eeschema/plot.cpp

eeschema/read_from_file_schematic_items_descriptions.cpp

eeschema/schedit.cpp

eeschema/sheet.cpp

eeschema/sheetlab.cpp

eeschema/symbedit.cpp

eeschema/tool_lib.cpp

eeschema/tool_sch.cpp

gerbview/files.cpp

pcbnew/automove.cpp

pcbnew/class_edge_mod.cpp

pcbnew/dialog_gendrill_base.cpp

pcbnew/dialog_gendrill_base.fbp

pcbnew/help_common_strings.h

pcbnew/menubar_pcbframe.cpp

pcbnew/tool_pcb.cpp

pcbnew/zones_convert_brd_items_to_polygons.cpp

Older »